Bug 100079 - [chromium] use relative paths for includes in the TestRunner's public API
Summary: [chromium] use relative paths for includes in the TestRunner's public API
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: jochen
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-22 23:19 PDT by jochen
Modified: 2012-10-24 10:44 PDT (History)
3 users (show)

See Also:


Attachments
Patch (2.18 KB, patch)
2012-10-22 23:20 PDT, jochen
no flags Details | Formatted Diff | Diff
Patch (1.72 KB, patch)
2012-10-23 13:15 PDT, jochen
no flags Details | Formatted Diff | Diff
Patch (3.15 KB, patch)
2012-10-23 15:51 PDT, jochen
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description jochen 2012-10-22 23:19:42 PDT
[chromium] use relative paths for includes in the TestRunner's public API
Comment 1 jochen 2012-10-22 23:20:23 PDT
Created attachment 170068 [details]
Patch
Comment 2 Adam Barth 2012-10-22 23:29:04 PDT
Comment on attachment 170068 [details]
Patch

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

> Tools/DumpRenderTree/chromium/TestRunner/public/WebEventSender.h:34
> -#include "WebDragOperation.h"
> +#include "../../../../../Source/WebKit/chromium/public/WebDragOperation.h"

Yuck.  I think we should just add "Source" to the include path and be able to include these headers as:

#include "WebKit/chromium/public/WebDragOperation.h"

That would also solve our problem of including Platform/chromium/public headers in WebKit/chromium/public.
Comment 3 James Robinson 2012-10-23 11:07:07 PDT
Comment on attachment 170068 [details]
Patch

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

> Tools/ChangeLog:8
> +        When including the headers from chromium, we need to specify the full path.

Gross! And not really true.  What target is including these headers?  It almost certainly has quite a few things on the include path already, one of which we could definitely use
Comment 4 jochen 2012-10-23 11:56:10 PDT
Comment on attachment 170068 [details]
Patch

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

>> Tools/ChangeLog:8
>> +        When including the headers from chromium, we need to specify the full path.
> 
> Gross! And not really true.  What target is including these headers?  It almost certainly has quite a few things on the include path already, one of which we could definitely use

content_shell_lib in chromium (i can post a patch, it's not yet landed)

Note that the headers in e.g. Source/WebKit/chromium/public/platform have similar includes.
Comment 5 jochen 2012-10-23 12:13:00 PDT
(In reply to comment #4)
> (From update of attachment 170068 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=170068&action=review
> 
> >> Tools/ChangeLog:8
> >> +        When including the headers from chromium, we need to specify the full path.
> > 
> > Gross! And not really true.  What target is including these headers?  It almost certainly has quite a few things on the include path already, one of which we could definitely use
> 
> content_shell_lib in chromium (i can post a patch, it's not yet landed)
> 
> Note that the headers in e.g. Source/WebKit/chromium/public/platform have similar includes.

https://codereview.chromium.org/11245004/
Comment 6 James Robinson 2012-10-23 12:23:04 PDT
Can you make the DumpRenderTree.gyp:TestRunner target put something reasonable on the include path of direct_dependent_settings?
Comment 7 jochen 2012-10-23 13:15:06 PDT
Created attachment 170213 [details]
Patch
Comment 8 jochen 2012-10-23 13:15:12 PDT
(In reply to comment #6)
> Can you make the DumpRenderTree.gyp:TestRunner target put something reasonable on the include path of direct_dependent_settings?

that seems to be working
Comment 9 Adam Barth 2012-10-23 13:51:40 PDT
Comment on attachment 170213 [details]
Patch

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

> Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:112
> +                ['inside_chromium_build==1', {
> +                    'direct_dependent_settings': {
> +                        'include_dirs': [
> +                            '../../../Source/WebKit/chromium/public',
> +                        ],
> +                    },
> +                }],

Is this better than adding ../../../Source ?  I guess it depends how explicit we want to be about where these headers come from.
Comment 10 Adam Barth 2012-10-23 13:52:38 PDT
We eventually want to get rid of the "forwarding" headers in WebKit/chromium/public/platform.  We should pick something here that can scale to that case too.
Comment 11 jochen 2012-10-23 15:51:03 PDT
Created attachment 170255 [details]
Patch
Comment 12 jochen 2012-10-23 15:51:22 PDT
(In reply to comment #10)
> We eventually want to get rid of the "forwarding" headers in WebKit/chromium/public/platform.  We should pick something here that can scale to that case too.

like this?
Comment 13 Adam Barth 2012-10-23 23:42:48 PDT
Comment on attachment 170255 [details]
Patch

I'm happy with that.  @jamesr ?

(Jochen, please feel free to land this patch if its blocking you.  We can iterate based on jamesr's feedback.)
Comment 14 James Robinson 2012-10-24 10:39:21 PDT
Comment on attachment 170255 [details]
Patch

Looks good to me!
Comment 15 jochen 2012-10-24 10:40:00 PDT
Comment on attachment 170255 [details]
Patch

James ack'd via chat
Comment 16 WebKit Review Bot 2012-10-24 10:44:18 PDT
Comment on attachment 170255 [details]
Patch

Clearing flags on attachment: 170255

Committed r132370: <http://trac.webkit.org/changeset/132370>
Comment 17 WebKit Review Bot 2012-10-24 10:44:22 PDT
All reviewed patches have been landed.  Closing bug.