Bug 90117 – [chromium] Split WebScrollbar into WebPluginScrollbar and WebScrollbar

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

[Adrienne Walker]

[chromium] Split WebScrollbar into WebPluginScrollbar and WebScrollbar

[Adrienne Walker]

Created attachment 149835 [details]
Patch

[WebKit Review Bot]

Please wait for approval from [e-mail], [e-mail], [e-mail], [e-mail] or [e-mail] before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI.

[James Robinson]

Comment on attachment 149835 [details]
Patch

R=me

[WebKit Review Bot]

Comment on attachment 149835 [details]
Patch

Attachment 149835 [details] did not pass chromium-ews (chromium-xvfb):
Output: http://queues.webkit.org/results/13102871

[Adrienne Walker]

Created attachment 149977 [details]
Take 2

[Adrienne Walker]

diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
index 12cf8a8..8eb0985 100644
--- a/Source/WebKit/chromium/WebKit.gyp
+++ b/Source/WebKit/chromium/WebKit.gyp
@@ -76,7 +76,7 @@
                 '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
             ],
             'export_dependent_settings': [
-                '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
+                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
                 '<(chromium_src_dir)/skia/skia.gyp:skia',
                 '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
                 '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',

[Adrienne Walker]

Alternatively, I think I could add Platform as a dependency on webkit_glue if you think that'd be better?

[James Robinson]

Comment on attachment 149977 [details]
Take 2

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

> Source/WebKit/chromium/WebKit.gyp:79
> +                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',

So folks who depend on WebKit.gyp:webkit see all of WebCore's dependent settings?  Is that so they can pick up the Platform include path?

[Adrienne Walker]

(In reply to comment #8)
> (From update of attachment 149977 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=149977&action=review
> 
> > Source/WebKit/chromium/WebKit.gyp:79
> > +                '../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
> 
> So folks who depend on WebKit.gyp:webkit see all of WebCore's dependent settings?  Is that so they can pick up the Platform include path?

Yeah.  Maybe Platform isn't exporting its include path properly? Since webkit_glue depends on WebKit and WebKit (in patch 1) was exporting Platform's dependent settings.

[Adrienne Walker]

Created attachment 149989 [details]
Patch

[Adrienne Walker]

Back to patch 1.  I had some local build errors, but I think something was stale.  Once DEPS rolls in 90196, things should be ok.

[WebKit Review Bot]

Comment on attachment 149989 [details]
Patch

Clearing flags on attachment: 149989

Committed r121486: <http://trac.webkit.org/changeset/121486>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.