Bug 68096 - [Skia/Chrome] Cleanup unneeded code now that GrGLInterface is used to set GL ctx per GL call.
Summary: [Skia/Chrome] Cleanup unneeded code now that GrGLInterface is used to set GL ...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Canvas (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Brian Salomon
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-14 11:48 PDT by Brian Salomon
Modified: 2011-09-15 08:12 PDT (History)
6 users (show)

See Also:


Attachments
Patch (20.04 KB, patch)
2011-09-14 12:06 PDT, Brian Salomon
no flags Details | Formatted Diff | Diff
Patch (20.06 KB, patch)
2011-09-14 12:17 PDT, Brian Salomon
no flags Details | Formatted Diff | Diff
Patch (20.12 KB, patch)
2011-09-15 06:13 PDT, Brian Salomon
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Brian Salomon 2011-09-14 11:48:26 PDT
[Skia/Chrome] Cleanup unneeded code now that GrGLInterface is used to set GL ctx per GL call.
Comment 1 Brian Salomon 2011-09-14 12:06:19 PDT
Created attachment 107366 [details]
Patch
Comment 2 Brian Salomon 2011-09-14 12:17:23 PDT
Created attachment 107372 [details]
Patch
Comment 3 Brian Salomon 2011-09-14 12:21:29 PDT
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.
Comment 4 Kenneth Russell 2011-09-14 12:35:01 PDT
Comment on attachment 107372 [details]
Patch

Thumbs up to code deletion as long as it's been tested.
Comment 5 Stephen White 2011-09-14 13:17:22 PDT
Comment on attachment 107372 [details]
Patch

Me likey.

Hopefully it won't conflict with Jamesr's change (just landed).
Comment 6 WebKit Review Bot 2011-09-14 20:28:53 PDT
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
Comment 7 Brian Salomon 2011-09-15 06:13:46 PDT
Created attachment 107485 [details]
Patch
Comment 8 Brian Salomon 2011-09-15 06:46:47 PDT
It did conflict with James's patch and both ChangeLogs had conflicts. New patch, same as the old patch.
Comment 9 Stephen White 2011-09-15 07:33:06 PDT
Comment on attachment 107485 [details]
Patch

Looks good.  r=me
Comment 10 WebKit Review Bot 2011-09-15 08:12:22 PDT
Comment on attachment 107485 [details]
Patch

Clearing flags on attachment: 107485

Committed r95192: <http://trac.webkit.org/changeset/95192>
Comment 11 WebKit Review Bot 2011-09-15 08:12:27 PDT
All reviewed patches have been landed.  Closing bug.