gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc - Issue 1414683003: Fix gpu command buffer use after free by GrContext

Side by Side Diff: gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc

Issue 1414683003: Fix gpu command buffer use after free by GrContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: test fixup Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"	5 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"

6	6

7 #ifndef GL_GLEXT_PROTOTYPES	7 #ifndef GL_GLEXT_PROTOTYPES

8 #define GL_GLEXT_PROTOTYPES	8 #define GL_GLEXT_PROTOTYPES

9 #endif	9 #endif

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "gpu/GLES2/gl2extchromium.h"	11 #include "gpu/GLES2/gl2extchromium.h"

12 #include "third_party/khronos/GLES2/gl2.h"	12 #include "third_party/khronos/GLES2/gl2.h"

13 #include "third_party/khronos/GLES2/gl2ext.h"	13 #include "third_party/khronos/GLES2/gl2ext.h"

14 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"	14 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"

15	15

16 namespace skia_bindings {	16 namespace skia_bindings {

17	17

18 GrGLInterface* CreateCommandBufferSkiaGLBinding() {	18 void InitCommandBufferSkiaGLBinding(GrGLInterface* interface) {

19 GrGLInterface* interface = new GrGLInterface;

20 interface->fStandard = kGLES_GrGLStandard;	19 interface->fStandard = kGLES_GrGLStandard;

21 interface->fExtensions.init(kGLES_GrGLStandard,	20 interface->fExtensions.init(kGLES_GrGLStandard,

22 glGetString,	21 glGetString,

23 NULL,	22 NULL,

24 glGetIntegerv);	23 glGetIntegerv);

25	24

26 GrGLInterface::Functions* functions = &interface->fFunctions;	25 GrGLInterface::Functions* functions = &interface->fFunctions;

27 functions->fActiveTexture = glActiveTexture;	26 functions->fActiveTexture = glActiveTexture;

28 functions->fAttachShader = glAttachShader;	27 functions->fAttachShader = glAttachShader;

29 functions->fBindAttribLocation = glBindAttribLocation;	28 functions->fBindAttribLocation = glBindAttribLocation;

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
173 functions->fCoverFillPathInstanced = glCoverFillPathInstancedCHROMIUM;	172 functions->fCoverFillPathInstanced = glCoverFillPathInstancedCHROMIUM;

174 functions->fCoverStrokePathInstanced = glCoverStrokePathInstancedCHROMIUM;	173 functions->fCoverStrokePathInstanced = glCoverStrokePathInstancedCHROMIUM;

175 functions->fStencilThenCoverFillPathInstanced =	174 functions->fStencilThenCoverFillPathInstanced =

176 glStencilThenCoverFillPathInstancedCHROMIUM;	175 glStencilThenCoverFillPathInstancedCHROMIUM;

177 functions->fStencilThenCoverStrokePathInstanced =	176 functions->fStencilThenCoverStrokePathInstanced =

178 glStencilThenCoverStrokePathInstancedCHROMIUM;	177 glStencilThenCoverStrokePathInstancedCHROMIUM;

179 functions->fProgramPathFragmentInputGen =	178 functions->fProgramPathFragmentInputGen =

180 glProgramPathFragmentInputGenCHROMIUM;	179 glProgramPathFragmentInputGenCHROMIUM;

181 functions->fBindFragmentInputLocation = glBindFragmentInputLocationCHROMIUM;	180 functions->fBindFragmentInputLocation = glBindFragmentInputLocationCHROMIUM;

182 }	181 }

183

184 return interface;

185 }	182 }

186	183

187 } // namespace skia	184 } // namespace skia

OLD	NEW

« no previous file with comments | « gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h ('k') | third_party/WebKit/public/platform/WebGraphicsContext3D.h » ('j') | no next file with comments »