diff options
| author | bsalomon <bsalomon@google.com> | 2015-05-05 16:20:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 23:21:15 +0000 |
| commit | 37bf7edbf1bd467b6162033b7eb164a76b057d20 (patch) | |
| tree | 2e4861aabaed507696eec36a782d170c26e71d55 /content | |
| parent | 4bf88ec3975213f0b4ca7c2f6c95835e11b33d5b (diff) | |
| download | chromium_src-37bf7edbf1bd467b6162033b7eb164a76b057d20.zip chromium_src-37bf7edbf1bd467b6162033b7eb164a76b057d20.tar.gz chromium_src-37bf7edbf1bd467b6162033b7eb164a76b057d20.tar.bz2 | |
Remove use of deprecated GrContext functions.
Replaces explicit use of scratch textures in gl_renderer.cc and instead uses NewRenderTarget() to create the texture.
Review URL: https://codereview.chromium.org/1120333006
Cr-Commit-Position: refs/heads/master@{#328432}
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/media/android/webmediaplayer_android.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index 284123a..d8e0bad 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -104,13 +104,14 @@ bool AllocateSkBitmapTexture(GrContext* gr, // RGBA to BGRA conversion. desc.fConfig = kRGBA_8888_GrPixelConfig; // kRenderTarget_GrTextureFlagBit avoids a copy before readback in skia. - desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit; + desc.fFlags = kRenderTarget_GrSurfaceFlag; desc.fSampleCnt = 0; desc.fOrigin = kTopLeft_GrSurfaceOrigin; desc.fWidth = size.width(); desc.fHeight = size.height(); skia::RefPtr<GrTexture> texture = skia::AdoptRef( - gr->refScratchTexture(desc, GrContext::kExact_ScratchTexMatch)); + gr->textureProvider()->refScratchTexture( + desc, GrTextureProvider::kExact_ScratchTexMatch)); if (!texture.get()) return false; |