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

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Tony Chang]

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

[Tony Chang]

Created attachment 53322 [details]
Patch

[Tony Chang]

Kent-san would make a good reviewer for this.

[Kent Tamura]

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]

Created attachment 53395 [details]
Patch

[Tony Chang]

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 on attachment 53395 [details]
Patch

LGTM.

[Dimitri Glazkov (Google)]

Comment on attachment 53395 [details]
Patch

yay!

[WebKit Commit Bot]

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]

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