Modified: trunk/Source/WebCore/ChangeLog (92788 => 92789)
--- trunk/Source/WebCore/ChangeLog 2011-08-10 19:52:27 UTC (rev 92788)
+++ trunk/Source/WebCore/ChangeLog 2011-08-10 19:53:50 UTC (rev 92789)
@@ -1,3 +1,14 @@
+2011-08-10 Scott Graham <[email protected]>
+
+ OpenTypeSanitizer in chromium gyp files is linked twice
+ https://bugs.webkit.org/show_bug.cgi?id=65927
+
+ Reviewed by Adam Barth.
+
+ No new tests, should just build and link properly on all platforms.
+
+ * WebCore.gyp/WebCore.gyp:
+
2011-08-10 Oliver Hunt <[email protected]>
Make GC checks more aggressive in release builds
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (92788 => 92789)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-08-10 19:52:27 UTC (rev 92788)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-08-10 19:53:50 UTC (rev 92789)
@@ -1328,8 +1328,6 @@
['exclude', '(android|brew|cairo|ca|cf|cg|curl|efl|freetype|gstreamer|gtk|haiku|linux|mac|opengl|openvg|opentype|pango|posix|qt|soup|svg|symbian|texmap|iphone|win|wince|wx)/'],
['exclude', '(?<!Chromium)(Android|Cairo|CF|CG|Curl|Gtk|JSC|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|WinCE|Wx)\\.(cpp|mm?)$'],
- ['include', 'platform/graphics/opentype/OpenTypeSanitizer\\.cpp$'],
-
['exclude', 'platform/LinkHash\\.cpp$'],
['exclude', 'platform/MIMETypeRegistry\\.cpp$'],
['exclude', 'platform/Theme\\.cpp$'],
@@ -1360,8 +1358,12 @@
'<(chromium_src_dir)/third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
],
}],
- ['OS=="mac" and use_skia==0', {
+ ['OS!="win"', {
'sources/': [
+ ['include', 'platform/graphics/opentype/OpenTypeSanitizer\\.cpp$'],
+ ],
+ }],['OS=="mac" and use_skia==0', {
+ 'sources/': [
# The Mac build is PLATFORM_CG too. platform/graphics/cg is the
# only place that CG files we want to build are located, and not
# all of them even have a CG suffix, so just add them by a
