Bug 95876 – [chromium] Put webcore_platform_files in separate gyp target instead of relying on exclusion patterns

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

[James Robinson]

[chromium] Put webcore_platform_files in separate gyp target instead of relying on exclusion patterns

[James Robinson]

Created attachment 162302 [details]
Patch

[Tony Chang]

Comment on attachment 162302 [details]
Patch

It should also make gyp a tiny bit faster.

[James Robinson]

Committed r127629: <http://trac.webkit.org/changeset/127629>

[James Robinson]

Reverted r127629 for reason:

Broke build

Committed r127632: <http://trac.webkit.org/changeset/127632>

[James Robinson]

I accidentally landed a version without the ['exclude', '.*'], ['include', 'platform/'], stanza, but that's still important.

[James Robinson]

Created attachment 162306 [details]
Patch

[James Robinson]

Committed r127635: <http://trac.webkit.org/changeset/127635>

[WebKit Review Bot]

Re-opened since this is blocked by 95905

[Kenichi Ishibashi]

From http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Mac%20Builder/builds/30631/steps/compile/logs/stdio


Undefined symbols:
  "__ZN7WebCore14RenderThemeMac17adjustRepaintRectEPKNS_12RenderObjectERNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac37paintMediaFullScreenVolumeSliderThumbEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac22paintCapsLockIndicatorEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:

      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac23platformColorsDidChangeEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac18meterSizeForBoundsEPKNS_11RenderMeterERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore29isCharacterSmartReplaceExemptEib", referenced from:
      __ZN7WebCore23ReplaceSelectionCommand24addSpacesForSmartReplaceEv in libwebcore_remaining.a(webcore_remaining.ReplaceSelectionCommand.o)
      __ZN7WebCore23ReplaceSelectionCommand24addSpacesForSmartReplaceEv in libwebcore_remaining.a(webcore_remaining.ReplaceSelectionCommand.o)
  "__ZNK7WebCore14RenderThemeMac19adjustMenuListStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac45platformActiveListBoxSelectionForegroundColorEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac20adjustTextFieldStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac13paintMenuListEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac23paintMediaTimeRemainingEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac14paintTextFieldEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac45platformActiveListBoxSelectionBackgroundColorEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac28paintSearchFieldCancelButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac34adjustSearchFieldCancelButtonStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac40platformInactiveSelectionBackgroundColorEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac22adjustSliderTrackStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac16paintSliderThumbEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac37animationRepeatIntervalForProgressBarEPNS_14RenderProgressE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac37paintMediaFullScreenVolumeSliderTrackEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac27paintMediaSeekForwardButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac32adjustSearchFieldDecorationStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac24popupInternalPaddingLeftEPNS_11RenderStyleE", referenced from:
      __ZNK7WebCore22RenderThemeChromiumMac24popupInternalPaddingLeftEPNS_11RenderStyleE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac19paintMenuListButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac21paintMediaCurrentTimeEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac28paintMediaControlsBackgroundEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac22platformFocusRingColorEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac31sliderTickOffsetFromTrackCenterEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac20fileListNameForWidthEPKNS_8FileListERKNS_4FontEib", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac14sliderTickSizeEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac22adjustProgressBarStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac15isControlStyledEPKNS_11RenderStyleERKNS_10BorderDataERKNS_9FillLayerERKNS_5ColorE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac36paintMediaToggleClosedCaptionsButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac35adjustSearchFieldResultsButtonStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac47platformInactiveListBoxSelectionForegroundColorEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac31animationDurationForProgressBarEPNS_14RenderProgressE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac13paintTextAreaEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac25popupInternalPaddingRightEPNS_11RenderStyleE", referenced from:
      __ZNK7WebCore22RenderThemeChromiumMac25popupInternalPaddingRightEPNS_11RenderStyleE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac23popupInternalPaddingTopEPNS_11RenderStyleE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac24paintMediaSeekBackButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac16paintSliderTrackEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac22paintMediaRewindButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac47platformInactiveListBoxSelectionBackgroundColorEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac19adjustTextAreaStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac13supportsMeterENS_11ControlPartE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac20controlSupportsTintsEPKNS_12RenderObjectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac26paintSearchFieldDecorationEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac38platformActiveSelectionBackgroundColorEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac16paintSearchFieldEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac26popupInternalPaddingBottomEPNS_11RenderStyleE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMacC2Ev", referenced from:
      __ZN7WebCore11RenderTheme12themeForPageEPNS_4PageE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMacD2Ev", referenced from:
      __ZN7WebCore22RenderThemeChromiumMacD1Ev in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
      __ZN7WebCore22RenderThemeChromiumMacD0Ev in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac22adjustSliderThumbStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac10paintMeterEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac21adjustSliderThumbSizeEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac28usesMediaControlVolumeSliderEv", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac19minimumMenuListSizeEPNS_11RenderStyleE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac11systemColorEi", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac39adjustSearchFieldResultsDecorationStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac10systemFontEiRNS_15FontDescriptionE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac16paintProgressBarEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac25adjustMenuListButtonStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZNK7WebCore14RenderThemeMac22adjustSearchFieldStyleEPNS_13StyleResolverEPNS_11RenderStyleEPNS_7ElementE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac29paintSearchFieldResultsButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac32paintMediaReturnToRealtimeButtonEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
  "__ZN7WebCore14RenderThemeMac33paintSearchFieldResultsDecorationEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE", referenced from:
      __ZTVN7WebCore22RenderThemeChromiumMacE in libwebcore_rendering.a(webcore_rendering.RenderThemeChromiumMac.o)
ld: symbol(s) not found

[James Robinson]

The os=="mac" section of the webcore_platform target pulls in some extra files, including this gem:
            ['include', 'rendering/RenderThemeMac\\.mm$'],

as well as:
 ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],

I think all I need to do is have that conditional add these sources with the normal gyp list appending instead of using 'sources/'.  Everything else referenced in the mac section is in the platform/ tree so should work fine.  I'll confirm on a mac, though.

[James Robinson]

Created attachment 162399 [details]
Patch

[James Robinson]

This restores these files which on mac were being compiled into webcore_platform:

'../editing/SmartReplaceCF.cpp',
'../rendering/RenderThemeMac.mm',
'../../WebKit/mac/WebCoreSupport/WebSystemInterface.mm',

SmartReplaceCF.cpp came in by the way the regex include/excludes work. It's maybe a bit weird to put these two in webcore_platform but the oddities of WebSystemInterface are a bit beyond me so I'd rather keep things as is in this patch.

[James Robinson]

http://trac.webkit.org/changeset/127687

[Eric Seidel (no email)]

Comment on attachment 162399 [details]
Patch

Cleared review? from attachment 162399 [details] so that this bug does not appear in http://webkit.org/pending-review.  If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again).