Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: webkit/config.h.in

Issue 43094: Prevent system WebCore.framework from not working due to collisions with... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/config.h.in
===================================================================
--- webkit/config.h.in (revision 11450)
+++ webkit/config.h.in (working copy)
@@ -127,14 +127,43 @@
#define WTF_USE_GOOGLEURL 1
-#if !PLATFORM(DARWIN)
+#if PLATFORM(DARWIN)
+
+// Chromium's version of WebCore includes the following Objective-C classes.
+// The system-provided WebCore framework may also provide these classes.
+// Because of the nature of Objective-C binding (dynamically at runtime),
+// it's possible for the Chromium-provided versions to interfere with the
+// system-provided versions. This may happen when a system framework attempts
+// to use WebCore.framework, such as when converting an HTML-flavored string
+// to an NSAttributedString. The solution is to force Objective-C class names
+// that would conflict to use alternate names.
+//
+// TODO(mark): This list will hopefully shrink but may also grow. Periodically
+// run "nm libwebcore.a | grep -E '[atsATS] ([+-]\[|\.objc_class_name)'" and
+// make sure that everything listed there has the alternate ChromiumWebCoreObjC
+// name, and that nothing extraneous is listed here. If all Objective-C can
+// be eliminated from Chromium's WebCore library, these defines should be
+// removed entirely.
+
+#define ScrollbarPrefsObserver \
+ ChromiumWebCoreObjCScrollbarPrefsObserver
+#define WebCoreControlTintObserver \
+ ChromiumWebCoreObjCWebCoreControlTintObserver
+#define WebCoreRenderThemeNotificationObserver \
+ ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver
+#define WebFontCache \
+ ChromiumWebCoreObjCWebFontCache
+
+#else // !PLATFORM(DARWIN)
+
// Don't define SKIA on Mac. Undefine other things as well that might get set
// as side-effects.
#define WTF_PLATFORM_SKIA 1
#undef WTF_PLATFORM_CG
#undef WTF_PLATFORM_CF
-#endif
+#endif // !PLATFORM(DARWIN)
+
#if !defined(WTF_USE_V8)
#define WTF_USE_V8 1
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698