Bug 151186 - Fix build failure due to missing NeverDestroyed.h include after r192169
Summary: Fix build failure due to missing NeverDestroyed.h include after r192169
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: Other
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Csaba Osztrogonác
Depends on:
Blocks: 150986
  Show dependency treegraph
Reported: 2015-11-12 03:47 PST by Csaba Osztrogonác
Modified: 2015-11-12 10:21 PST (History)
6 users (show)

See Also:

Patch (1.11 KB, patch)
2015-11-12 03:53 PST, Csaba Osztrogonác
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Csaba Osztrogonác 2015-11-12 03:47:09 PST
http://trac.webkit.org/changeset/192169 broke the --minimal build:

../../Source/WebCore/rendering/RenderCombineText.cpp: In member function ‘void WebCore::RenderCombineText::combineText()’:
../../Source/WebCore/rendering/RenderCombineText.cpp:185:71: error: variable ‘WTF::NeverDestroyed<WTF::String> objectReplacementCharacterString’ has initializer but incomplete type
         static NeverDestroyed<String> objectReplacementCharacterString(&objectReplacementCharacter, 1);
ninja: build stopped: subcommand failed.

The normal build works fine, because some #if guarded header includes NeverDestroyed.h,
but RenderCombineText.cpp shouldn't rely on this transitive dependency.
Comment 1 Csaba Osztrogonác 2015-11-12 03:53:23 PST
Created attachment 265381 [details]
Comment 2 Darin Adler 2015-11-12 09:33:40 PST
Comment on attachment 265381 [details]

In general we *do* rely on transitive dependencies all the time, but if it’s platform specific, then a fix like this is fine.
Comment 3 WebKit Commit Bot 2015-11-12 10:21:34 PST
Comment on attachment 265381 [details]

Clearing flags on attachment: 265381

Committed r192368: <http://trac.webkit.org/changeset/192368>
Comment 4 WebKit Commit Bot 2015-11-12 10:21:39 PST
All reviewed patches have been landed.  Closing bug.