Bug 68096 – [Skia/Chrome] Cleanup unneeded code now that GrGLInterface is used to set GL ctx per GL call.

• Status: RESOLVED
• Resolution: FIXED
• Component: Canvas

[Brian Salomon]

[Skia/Chrome] Cleanup unneeded code now that GrGLInterface is used to set GL ctx per GL call.

[Brian Salomon]

Created attachment 107366 [details]
Patch

[Brian Salomon]

Created attachment 107372 [details]
Patch

[Brian Salomon]

Comment on attachment 107372 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=107372&action=review

> Source/WebKit/chromium/src/WebGraphicsContext3D.cpp:-35
> -#if GR_GL_PER_GL_FUNC_CALLBACK

These guards were here to perform a two-sided change. It should always defined to 1 now. If it isn't I'd rather see the below code fail to compile than silently succeed without inserting the callback.

[Kenneth Russell]

Comment on attachment 107372 [details]
Patch

Thumbs up to code deletion as long as it's been tested.

[Stephen White]

Comment on attachment 107372 [details]
Patch

Me likey.

Hopefully it won't conflict with Jamesr's change (just landed).

[WebKit Review Bot]

Comment on attachment 107372 [details]
Patch

Rejecting attachment 107372 [details] from commit-queue.

Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2

Last 500 characters of output:
/platform/graphics/skia/SkiaFontWin.cpp
patching file Source/WebKit/chromium/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file Source/WebKit/chromium/public/WebGraphicsContext3D.h
patching file Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
Hunk #1 succeeded at 202 (offset 1 line).
patching file Source/WebKit/chromium/src/WebGraphicsContext3D.cpp

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Kenneth Russell', u'--..." exit_code: 1

Full output: http://queues.webkit.org/results/9676009

[Brian Salomon]

Created attachment 107485 [details]
Patch

[Brian Salomon]

It did conflict with James's patch and both ChangeLogs had conflicts. New patch, same as the old patch.

[Stephen White]

Comment on attachment 107485 [details]
Patch

Looks good.  r=me

[WebKit Review Bot]

Comment on attachment 107485 [details]
Patch

Clearing flags on attachment: 107485

Committed r95192: <http://trac.webkit.org/changeset/95192>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.