Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h

Issue 1566283003: Upgrade blink side ReadPixels size validation to consider ES3 pack parameters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 months 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef WebGL2RenderingContextBase_h 5 #ifndef WebGL2RenderingContextBase_h
6 #define WebGL2RenderingContextBase_h 6 #define WebGL2RenderingContextBase_h
7 7
8 #include "modules/webgl/WebGLExtension.h" 8 #include "modules/webgl/WebGLExtension.h"
9 #include "modules/webgl/WebGLRenderingContextBase.h" 9 #include "modules/webgl/WebGLRenderingContextBase.h"
10 10
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 void texSubImage3DImpl(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, I mage*, WebGLImageConversion::ImageHtmlDomSource, bool, bool); 205 void texSubImage3DImpl(GLenum, GLint, GLint, GLint, GLint, GLenum, GLenum, I mage*, WebGLImageConversion::ImageHtmlDomSource, bool, bool);
206 void samplerParameter(WebGLSampler*, GLenum, GLfloat, GLint, bool); 206 void samplerParameter(WebGLSampler*, GLenum, GLfloat, GLint, bool);
207 207
208 bool isBufferBoundToTransformFeedback(WebGLBuffer*); 208 bool isBufferBoundToTransformFeedback(WebGLBuffer*);
209 bool isBufferBoundToNonTransformFeedback(WebGLBuffer*); 209 bool isBufferBoundToNonTransformFeedback(WebGLBuffer*);
210 bool validateBufferTargetCompatibility(const char*, GLenum, WebGLBuffer*); 210 bool validateBufferTargetCompatibility(const char*, GLenum, WebGLBuffer*);
211 211
212 bool validateBufferBaseTarget(const char* functionName, GLenum target); 212 bool validateBufferBaseTarget(const char* functionName, GLenum target);
213 bool validateAndUpdateBufferBindBaseTarget(const char* functionName, GLenum, GLuint, WebGLBuffer*); 213 bool validateAndUpdateBufferBindBaseTarget(const char* functionName, GLenum, GLuint, WebGLBuffer*);
214 214
215 WebGLImageConversion::PixelStoreParams getPackPixelStoreParams() override;
216 WebGLImageConversion::PixelStoreParams getUnpackPixelStoreParams() override;
217
215 bool checkAndTranslateAttachments(const char* functionName, GLenum, const Ve ctor<GLenum>&, Vector<GLenum>&); 218 bool checkAndTranslateAttachments(const char* functionName, GLenum, const Ve ctor<GLenum>&, Vector<GLenum>&);
216 219
217 /* WebGLRenderingContextBase overrides */ 220 /* WebGLRenderingContextBase overrides */
218 unsigned getMaxWebGLLocationLength() const override { return 1024; }; 221 unsigned getMaxWebGLLocationLength() const override { return 1024; };
219 bool validateCapability(const char* functionName, GLenum) override; 222 bool validateCapability(const char* functionName, GLenum) override;
220 bool validateBufferTarget(const char* functionName, GLenum target) override; 223 bool validateBufferTarget(const char* functionName, GLenum target) override;
221 bool validateAndUpdateBufferBindTarget(const char* functionName, GLenum, Web GLBuffer*) override; 224 bool validateAndUpdateBufferBindTarget(const char* functionName, GLenum, Web GLBuffer*) override;
222 WebGLTexture* validateTextureBinding(const char* functionName, GLenum target , bool useSixEnumsForCubeMap) override; 225 WebGLTexture* validateTextureBinding(const char* functionName, GLenum target , bool useSixEnumsForCubeMap) override;
223 bool validateFramebufferTarget(GLenum target) override; 226 bool validateFramebufferTarget(GLenum target) override;
224 bool validateReadPixelsFormatAndType(GLenum format, GLenum type) override; 227 bool validateReadPixelsFormatAndType(GLenum format, GLenum type) override;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 GLint m_unpackSkipImages; 282 GLint m_unpackSkipImages;
280 }; 283 };
281 284
282 DEFINE_TYPE_CASTS(WebGL2RenderingContextBase, CanvasRenderingContext, context, 285 DEFINE_TYPE_CASTS(WebGL2RenderingContextBase, CanvasRenderingContext, context,
283 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) >= 2, 286 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) >= 2,
284 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) >= 2) ; 287 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) >= 2) ;
285 288
286 } // namespace blink 289 } // namespace blink
287 290
288 #endif 291 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698