Title: [95396] trunk/Source/WebCore
- Revision
- 95396
- Author
- m...@apple.com
- Date
- 2011-09-18 11:18:26 -0700 (Sun, 18 Sep 2011)
Log Message
Try to fix the Chromium Mac build after r95391.
* WebCore.gyp/WebCore.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95395 => 95396)
--- trunk/Source/WebCore/ChangeLog 2011-09-18 18:05:02 UTC (rev 95395)
+++ trunk/Source/WebCore/ChangeLog 2011-09-18 18:18:26 UTC (rev 95396)
@@ -8,6 +8,12 @@
Try to fix the Chromium Mac build after r95391.
+ * WebCore.gyp/WebCore.gyp:
+
+2011-09-18 Dan Bernstein <m...@apple.com>
+
+ Try to fix the Chromium Mac build after r95391.
+
* WebCore.gypi: Updated for the renaming of ComplexTextController.cpp.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* platform/graphics/Font.h: Changed #if directives to include the Chromium Mac port.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (95395 => 95396)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-09-18 18:05:02 UTC (rev 95395)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-09-18 18:18:26 UTC (rev 95396)
@@ -1192,6 +1192,7 @@
# If this is unhandled, the console will receive log messages
# such as:
# com.google.Chrome[] objc[]: Class ScrollbarPrefsObserver is implemented in both .../Google Chrome.app/Contents/Versions/.../Google Chrome Helper.app/Contents/MacOS/../../../Google Chrome Framework.framework/Google Chrome Framework and /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore. One of the two will be used. Which one is undefined.
+ 'CascadeList=ChromiumWebCoreObjCCascadeList',
'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver',
'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',
'WebFontCache=ChromiumWebCoreObjCWebFontCache',
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
