| Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| index 27acdfa022c524e5474335da360c36863dc6d744..8fa335eb11cacbdde9506342d6f4bb2923ff1960 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| @@ -1014,6 +1014,9 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
|
|
| template <typename T>
|
| IntRect getTextureSourceSize(T* textureSource) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |width| and |height| below. */
|
| + return IntRect(0, 0, texture_source->width(), texture_source->height());
|
| return IntRect(0, 0, textureSource->width(), textureSource->height());
|
| }
|
|
|
| @@ -1028,6 +1031,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| DCHECK(functionName);
|
| DCHECK(selectingSubRectangle);
|
| DCHECK(image);
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |width| and |height| in the 2 lines below. */
|
| int imageWidth = static_cast<int>(image->width());
|
| int imageHeight = static_cast<int>(image->height());
|
| *selectingSubRectangle =
|
|
|