Modified: trunk/Source/WebKit/chromium/ChangeLog (127780 => 127781)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-06 20:19:40 UTC (rev 127780)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-06 20:55:13 UTC (rev 127781)
@@ -1,3 +1,17 @@
+2012-09-06 James Robinson <[email protected]>
+
+ [chromium] Put chromium implementations of WTF symbols in separate static library
+ https://bugs.webkit.org/show_bug.cgi?id=95933
+
+ Reviewed by Adam Barth.
+
+ A few symbols from WTF are implemented in chromium on top of the chromium WebKit Platform API. These
+ implementation files are in WebKit/chromium/src and currently link into the webkit target, which in the
+ component build is a DLL. This moves these files into a static library that webkit depends on so targets can
+ statically link in wtf and these support files without depending directly on webkit.
+
+ * WebKit.gyp:
+
2012-09-06 Iain Merrick <[email protected]>
[chromium] Add WebFrame::moveSelectionStart, moveSelectionEnd, moveCaret
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (127780 => 127781)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-09-06 20:19:40 UTC (rev 127780)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-09-06 20:55:13 UTC (rev 127781)
@@ -71,13 +71,14 @@
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
+ '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
'../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
- '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
'<(chromium_src_dir)/skia/skia.gyp:skia',
+ '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
'<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
- '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl',
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ 'webkit_wtf_support',
],
'export_dependent_settings': [
'../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
@@ -362,9 +363,6 @@
'src/DateTimeChooserImpl.h',
'src/ChromeClientImpl.cpp',
'src/ChromeClientImpl.h',
- 'src/ChromiumCurrentTime.cpp',
- 'src/ChromiumOSRandomSource.cpp',
- 'src/ChromiumThreading.cpp',
'src/ColorChooserUIController.cpp',
'src/ColorChooserUIController.h',
'src/CompositionUnderlineBuilder.h',
@@ -865,6 +863,29 @@
],
},
{
+ 'target_name': 'webkit_wtf_support',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
+ '../../WTF/WTF.gyp/WTF.gyp:wtf',
+ ],
+ 'defines': [
+ 'WEBKIT_IMPLEMENTATION=1',
+ ],
+ 'sources': [
+ 'src/ChromiumCurrentTime.cpp',
+ 'src/ChromiumOSRandomSource.cpp',
+ 'src/ChromiumThreading.cpp',
+ ],
+ 'conditions': [
+ ['component=="shared_library"', {
+ 'defines': [
+ 'WEBKIT_DLL',
+ ],
+ }],
+ ],
+ },
+ {
'target_name': 'inspector_resources',
'type': 'none',
'dependencies': [
