diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/gpu/skia_bindings | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
| download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/gpu/skia_bindings')
| -rw-r--r-- | chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.cc | 9 | ||||
| -rw-r--r-- | chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.h | 5 |
2 files changed, 3 insertions, 11 deletions
diff --git a/chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.cc b/chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.cc index 37820e9bb83..1d1e0c62aaa 100644 --- a/chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.cc +++ b/chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.cc @@ -4,6 +4,8 @@ #include "gpu/skia_bindings/gles2_implementation_with_grcontext_support.h" +#include <utility> + #include "gpu/skia_bindings/grcontext_for_gles2_interface.h" #include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/skia/include/gpu/GrContext.h" @@ -54,13 +56,6 @@ void GLES2ImplementationWithGrContextSupport::DidCallGLFromSkia() { using_gl_from_skia_ = false; } -void GLES2ImplementationWithGrContextSupport::EndRasterCHROMIUM() { - BaseClass::EndRasterCHROMIUM(); - // Assume that invoking the GLES2-backed version of the raster interface - // invalidates everything. - ResetGrContextIfNeeded(kALL_GrGLBackendState); -} - // Calls that invalidate kRenderTarget_GrGLBackendState void GLES2ImplementationWithGrContextSupport::BindFramebuffer( GLenum target, diff --git a/chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.h b/chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.h index baadbeefedf..01caceaea44 100644 --- a/chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.h +++ b/chromium/gpu/skia_bindings/gles2_implementation_with_grcontext_support.h @@ -38,9 +38,6 @@ class GLES2ImplementationWithGrContextSupport // These must be kept in sync with the invalidation defines in // GrGLGpu::onResetContext() - // Calls that invalidate arbitrary state - void EndRasterCHROMIUM() override; - // Calls that invalidate kRenderTarget_GrGLBackendState void BindFramebuffer(GLenum target, GLuint framebuffer) override; void BindRenderbuffer(GLenum target, GLuint renderbuffer) override; @@ -193,4 +190,4 @@ class GLES2ImplementationWithGrContextSupport } // namespace skia_bindings -#endif +#endif // GPU_SKIA_BINDINGS_GLES2_IMPLEMENTATION_WITH_GRCONTEXT_SUPPORT_H_ |