Bug 37561

Summary:

[chromium] Add TestShellGtk.cpp so we can link on Linux

Product:

WebKit

Reporter:

Tony Chang <tony>

Component:

New Bugs

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

commit-queue, dglazkov, fishd, tkent

Priority:

Version:

528+ (Nightly build)

Hardware:

Other

OS:

OS X 10.5

Bug Depends on:

Bug Blocks:

35902

Attachments:

Description	Flags
Patch	none
Patch	dglazkov: review+, commit-queue: commit-queue-

Tony Chang

Reported 2010-04-14 00:00:59 PDT

[chromium] Add TestShellGtk.cpp so we can link on Linux

Attachments
Patch (3.98 KB, patch) 2010-04-14 00:01 PDT, Tony Chang	no flags	Details Formatted Diff Diff
Patch (4.73 KB, patch) 2010-04-14 18:21 PDT, Tony Chang	dglazkov: review+ commit-queue: commit-queue-	Details Formatted Diff Diff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.

Tony Chang

Comment 1 2010-04-14 00:01:32 PDT

Created attachment 53322 [details] Patch

Tony Chang

Comment 2 2010-04-14 00:03:39 PDT

Kent-san would make a good reviewer for this.

Kent Tamura

Comment 3 2010-04-14 11:23:44 PDT

Comment on attachment 53322 [details] Patch > --- a/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp > +++ b/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp > @@ -91,6 +91,7 @@ > '../chromium/TestNavigationController.h', > '../chromium/TestShell.cpp', > '../chromium/TestShell.h', > + '../chromium/TestShellGtk.cpp', > '../chromium/TestShellMac.mm', > '../chromium/TextInputController.cpp', > '../chromium/TextInputController.h', Don't we need to have 'condition' block to exclude TestShellGtk.cpp for Mac ad TestShellMac.mm for non-Mac UNIX? C++ code looks ok.

Tony Chang

Comment 4 2010-04-14 18:21:24 PDT

Created attachment 53395 [details] Patch

Tony Chang

Comment 5 2010-04-14 18:23:16 PDT

Comment on attachment 53395 [details] Patch (In reply to comment #3) > (From update of attachment 53322 [details]) > > --- a/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp > > +++ b/WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp > > @@ -91,6 +91,7 @@ > > '../chromium/TestNavigationController.h', > > '../chromium/TestShell.cpp', > > '../chromium/TestShell.h', > > + '../chromium/TestShellGtk.cpp', > > '../chromium/TestShellMac.mm', > > '../chromium/TextInputController.cpp', > > '../chromium/TextInputController.h', > > Don't we need to have 'condition' block to exclude TestShellGtk.cpp for Mac ad > TestShellMac.mm for non-Mac UNIX? Yes, you're right. I added exclude blocks for files ending in Gtk, Linux, Mac, and Win. We didn't need it before for Mac.mm because .mm is excluded in common.gypi.

Kent Tamura

Comment 6 2010-04-14 18:26:53 PDT

Comment on attachment 53395 [details] Patch LGTM.

Dimitri Glazkov (Google)

Comment 7 2010-04-15 09:23:07 PDT

Comment on attachment 53395 [details] Patch yay!

WebKit Commit Bot

Comment 8 2010-04-15 09:54:57 PDT

Comment on attachment 53395 [details] Patch Rejecting patch 53395 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Dimitri Glazkov', '--force']" exit_code: 1 patching file WebKitTools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp Hunk #2 FAILED at 111. 1 out of 2 hunks FAILED -- saving rejects to file WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp.rej patching file WebKitTools/DumpRenderTree/chromium/TestShellGtk.cpp Full output: http://webkit-commit-queue.appspot.com/results/1586472

Tony Chang

Comment 9 2010-04-15 18:16:51 PDT

Committed r57703: <http://trac.webkit.org/changeset/57703>

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