45004 – Roll ANGLE under webkit to r402

RESOLVED FIXED Bug 45004

Roll ANGLE under webkit to r402

https://bugs.webkit.org/show_bug.cgi?id=45004

Summary Roll ANGLE under webkit to r402

Zhenyao Mo

Reported 2010-08-31 16:27:11 PDT

If we don't sync, Chromium and Safari will have to use different ANGLE interfaces.

Attachments
patch (354.43 KB, patch) 2010-08-31 16:31 PDT, Zhenyao Mo	kbr: review- zmo: commit-queue-	Details Formatted Diff Diff
revised patch (343.97 KB, patch) 2010-09-01 10:36 PDT, Zhenyao Mo	zmo: commit-queue-	Details Formatted Diff Diff
Revised patch (374.33 KB, patch) 2010-09-01 10:47 PDT, Zhenyao Mo	zmo: commit-queue-	Details Formatted Diff Diff
revised patch: fix an issue in the changelog (357.65 KB, patch) 2010-09-01 10:55 PDT, Zhenyao Mo	kbr: review+ zmo: commit-queue-	Details Formatted Diff Diff
Show Obsolete (3) View All Add attachment proposed patch, testcase, etc.

Zhenyao Mo

Comment 1 2010-08-31 16:31:11 PDT

Created attachment 66138 [details] patch Built webkit successfully with r402.

WebKit Review Bot

Comment 2 2010-08-31 16:33:39 PDT

Attachment 66138 [details] did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 Last 3072 characters of output: ce/declaration] [3] ANGLE/src/libEGL/Surface.cpp:115: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:118: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:121: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:130: Declaration has space between type name and * in IDirect3DSurface9 *renderTarget [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:130: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:132: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:135: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:147: Declaration has space between type name and * in IDirect3DTexture9 *flipTexture [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:147: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:149: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:163: Declaration has space between type name and * in IDirect3DSurface9 *backBuffer [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:163: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:166: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:167: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:168: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:169: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:170: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:209: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:301: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:303: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:307: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:309: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:317: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:323: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:327: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:341: Declaration has space between type name and * in IDirect3DTexture9 *flipTexture [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:344: Declaration has space between type name and * in IDirect3DSurface9 *renderTarget [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:358: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:372: One space before end of line comments [whitespace/comments] [5] Total errors found: 715 in 57 files If any of these errors are false positives, please file a bug against check-webkit-style.

Eric Seidel (no email)

Comment 3 2010-08-31 16:46:48 PDT

Attachment 66138 [details] did not build on mac: Build output: http://queues.webkit.org/results/3855201

Zhenyao Mo

Comment 4 2010-08-31 16:56:41 PDT

That's weird, my local Mac built fine with this patch. Might be some cached data.

Kenneth Russell

Comment 5 2010-08-31 16:58:20 PDT

Comment on attachment 66138 [details] patch Unfortunately it looks like you're going to need to modify WebCore.xcodeproj using XCode to fix the missing header reference. Please build WebKit on the Mac before submitting the next patch.

Paul Sawaya

Comment 6 2010-08-31 17:08:00 PDT

(In reply to comment #5) > (From update of attachment 66138 [details]) > Unfortunately it looks like you're going to need to modify WebCore.xcodeproj using XCode to fix the missing header reference. Please build WebKit on the Mac before submitting the next patch. I'm not sure, but I don't believe WebCore.xcodeproj references the ANGLE header (ResourceLimits.h) directly. You'll definitely want to update ANGLE/ANGLE.xcodeproj/project.pbxproj, though.

Zhenyao Mo

Comment 7 2010-09-01 10:36:15 PDT

Created attachment 66232 [details] revised patch

WebKit Review Bot

Comment 8 2010-09-01 10:38:59 PDT

Attachment 66232 [details] did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 Last 3072 characters of output: ce/declaration] [3] ANGLE/src/libEGL/Surface.cpp:115: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:118: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:121: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:130: Declaration has space between type name and * in IDirect3DSurface9 *renderTarget [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:130: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:132: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:135: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:147: Declaration has space between type name and * in IDirect3DTexture9 *flipTexture [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:147: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:149: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:163: Declaration has space between type name and * in IDirect3DSurface9 *backBuffer [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:163: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:166: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:167: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:168: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:169: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:170: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:209: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:301: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:303: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:307: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:309: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:317: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:323: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:327: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:341: Declaration has space between type name and * in IDirect3DTexture9 *flipTexture [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:344: Declaration has space between type name and * in IDirect3DSurface9 *renderTarget [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:358: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:372: One space before end of line comments [whitespace/comments] [5] Total errors found: 597 in 53 files If any of these errors are false positives, please file a bug against check-webkit-style.

Zhenyao Mo

Comment 9 2010-09-01 10:47:07 PDT

Created attachment 66235 [details] Revised patch

WebKit Review Bot

Comment 10 2010-09-01 10:49:40 PDT

Attachment 66235 [details] did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 Last 3072 characters of output: ce/declaration] [3] ANGLE/src/libEGL/Surface.cpp:115: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:118: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:121: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:130: Declaration has space between type name and * in IDirect3DSurface9 *renderTarget [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:130: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:132: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:135: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:147: Declaration has space between type name and * in IDirect3DTexture9 *flipTexture [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:147: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:149: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:163: Declaration has space between type name and * in IDirect3DSurface9 *backBuffer [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:163: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:166: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:167: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:168: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:169: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:170: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:209: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:301: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:303: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:307: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:309: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:317: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:323: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:327: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:341: Declaration has space between type name and * in IDirect3DTexture9 *flipTexture [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:344: Declaration has space between type name and * in IDirect3DSurface9 *renderTarget [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:358: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:372: One space before end of line comments [whitespace/comments] [5] Total errors found: 715 in 57 files If any of these errors are false positives, please file a bug against check-webkit-style.

Zhenyao Mo

Comment 11 2010-09-01 10:55:54 PDT

Created attachment 66237 [details] revised patch: fix an issue in the changelog

WebKit Review Bot

Comment 12 2010-09-01 10:58:47 PDT

Attachment 66237 [details] did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 Last 3072 characters of output: ce/declaration] [3] ANGLE/src/libEGL/Surface.cpp:115: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:118: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:121: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:130: Declaration has space between type name and * in IDirect3DSurface9 *renderTarget [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:130: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:132: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:135: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:147: Declaration has space between type name and * in IDirect3DTexture9 *flipTexture [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:147: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:149: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:163: Declaration has space between type name and * in IDirect3DSurface9 *backBuffer [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:163: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:166: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:167: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:168: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:169: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:170: More than one command on the same line in if [whitespace/parens] [4] ANGLE/src/libEGL/Surface.cpp:209: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:301: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:303: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:307: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:309: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:317: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:323: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:327: This { should be at the end of the previous line [whitespace/braces] [4] ANGLE/src/libEGL/Surface.cpp:341: Declaration has space between type name and * in IDirect3DTexture9 *flipTexture [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:344: Declaration has space between type name and * in IDirect3DSurface9 *renderTarget [whitespace/declaration] [3] ANGLE/src/libEGL/Surface.cpp:358: Use 0 instead of NULL. [readability/null] [5] ANGLE/src/libEGL/Surface.cpp:372: One space before end of line comments [whitespace/comments] [5] Total errors found: 715 in 57 files If any of these errors are false positives, please file a bug against check-webkit-style.

Kenneth Russell

Comment 13 2010-09-02 10:16:14 PDT

Comment on attachment 66237 [details] revised patch: fix an issue in the changelog I only went through the ChangeLog, project.pbxproj and GraphicsContext3DMac.mm; these look fine. r=me

Zhenyao Mo

Comment 14 2010-09-02 10:54:41 PDT

Committed r66675: <http://trac.webkit.org/changeset/66675>

Note You need to log in before you can comment on or make changes to this bug.

Status RESOLVED

Resolution FIXED

Priority P2

Severity Normal

Classification Unclassified

Version 528+ (Nightly build)

Hardware PC

OS OS X 10.5

Product WebKit

Component WebGL

Assignee

Zhenyao Mo

Reported

2010-08-31 16:27 PDT

Modified

2010-09-02 10:54 PDT History

CC List

6 users Show

URL

Keywords

Depends on

Blocks

44309

Dependancies

tree graph