third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h - Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)

Patch Set: More fixes - things build fine at this point. Created 3 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/remoteplayback/RemotePlaybackTest.cpp ('k') | third_party/WebKit/Source/platform/ColorData.gperf » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7d58fcf40e47bf6bab2b56de346c701d925ac20e..5a0f6593d118fbae3096a84ff014eeced4d445cc 100644

--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

@@ -1017,6 +1017,8 @@ 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, textureSource->width(), textureSource->height());

}

@@ -1031,6 +1033,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 =