Title: [128258] trunk/Source/WebCore
- Revision
- 128258
- Author
- [email protected]
- Date
- 2012-09-11 20:35:59 -0700 (Tue, 11 Sep 2012)
Log Message
[chromium/mac] Fix "Class WebCoreTextFieldCell is implemented in both Chromium Framework and /System/Library/Frameworks/WebKit.framework" warning
https://bugs.webkit.org/show_bug.cgi?id=96460
Reviewed by Kent Tamura.
This was added incorrectly in http://trac.webkit.org/changeset/116721
* WebCore.gyp/WebCore.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128257 => 128258)
--- trunk/Source/WebCore/ChangeLog 2012-09-12 02:24:57 UTC (rev 128257)
+++ trunk/Source/WebCore/ChangeLog 2012-09-12 03:35:59 UTC (rev 128258)
@@ -1,3 +1,14 @@
+2012-09-11 Nico Weber <[email protected]>
+
+ [chromium/mac] Fix "Class WebCoreTextFieldCell is implemented in both Chromium Framework and /System/Library/Frameworks/WebKit.framework" warning
+ https://bugs.webkit.org/show_bug.cgi?id=96460
+
+ Reviewed by Kent Tamura.
+
+ This was added incorrectly in http://trac.webkit.org/changeset/116721
+
+ * WebCore.gyp/WebCore.gyp:
+
2012-09-11 Keishi Hattori <[email protected]>
Create Localizer factory method for LocaleICU
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (128257 => 128258)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-09-12 02:24:57 UTC (rev 128257)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-09-12 03:35:59 UTC (rev 128258)
@@ -1474,6 +1474,7 @@
# 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.
'WebCascadeList=ChromiumWebCoreObjCWebCascadeList',
'WebCoreFlippedView=ChromiumWebCoreObjCWebCoreFlippedView',
+ 'WebCoreTextFieldCell=ChromiumWebCoreObjCWebCoreTextFieldCell',
'WebScrollbarPrefsObserver=ChromiumWebCoreObjCWebScrollbarPrefsObserver',
'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',
'WebFontCache=ChromiumWebCoreObjCWebFontCache',
@@ -1492,7 +1493,7 @@
'postbuild_name': 'Check Objective-C Rename',
'variables': {
'class_whitelist_regex':
- 'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView|WebCoreTextFieldCell',
+ 'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView',
'category_whitelist_regex':
'TCMInterposing|ScrollAnimatorChromiumMacExt',
},
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
