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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006 Apple Inc. 2 * Copyright (C) 2004, 2005, 2006 Apple Inc.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 #include <stdio.h> 120 #include <stdio.h>
121 #include <snprintf.h> 121 #include <snprintf.h>
122 #include <limits.h> 122 #include <limits.h>
123 #include <wtf/MathExtras.h> 123 #include <wtf/MathExtras.h>
124 #endif 124 #endif
125 125
126 #if PLATFORM(CHROMIUM) 126 #if PLATFORM(CHROMIUM)
127 127
128 #define WTF_USE_GOOGLEURL 1 128 #define WTF_USE_GOOGLEURL 1
129 129
130 #if !PLATFORM(DARWIN) 130 #if PLATFORM(DARWIN)
131
132 // Chromium's version of WebCore includes the following Objective-C classes.
133 // The system-provided WebCore framework may also provide these classes.
134 // Because of the nature of Objective-C binding (dynamically at runtime),
135 // it's possible for the Chromium-provided versions to interfere with the
136 // system-provided versions. This may happen when a system framework attempts
137 // to use WebCore.framework, such as when converting an HTML-flavored string
138 // to an NSAttributedString. The solution is to force Objective-C class names
139 // that would conflict to use alternate names.
140 //
141 // TODO(mark): This list will hopefully shrink but may also grow. Periodically
142 // run "nm libwebcore.a | grep -E '[atsATS] ([+-]\[|\.objc_class_name)'" and
143 // make sure that everything listed there has the alternate ChromiumWebCoreObjC
144 // name, and that nothing extraneous is listed here. If all Objective-C can
145 // be eliminated from Chromium's WebCore library, these defines should be
146 // removed entirely.
147
148 #define ScrollbarPrefsObserver \
149 ChromiumWebCoreObjCScrollbarPrefsObserver
150 #define WebCoreControlTintObserver \
151 ChromiumWebCoreObjCWebCoreControlTintObserver
152 #define WebCoreRenderThemeNotificationObserver \
153 ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver
154 #define WebFontCache \
155 ChromiumWebCoreObjCWebFontCache
156
157 #else // !PLATFORM(DARWIN)
158
131 // Don't define SKIA on Mac. Undefine other things as well that might get set 159 // Don't define SKIA on Mac. Undefine other things as well that might get set
132 // as side-effects. 160 // as side-effects.
133 #define WTF_PLATFORM_SKIA 1 161 #define WTF_PLATFORM_SKIA 1
134 #undef WTF_PLATFORM_CG 162 #undef WTF_PLATFORM_CG
135 #undef WTF_PLATFORM_CF 163 #undef WTF_PLATFORM_CF
136 #endif 164
165 #endif // !PLATFORM(DARWIN)
137 166
138 #if !defined(WTF_USE_V8) 167 #if !defined(WTF_USE_V8)
139 #define WTF_USE_V8 1 168 #define WTF_USE_V8 1
140 #endif 169 #endif
141 170
142 #undef WTF_USE_CFNETWORK 171 #undef WTF_USE_CFNETWORK
143 // Upstream Platform.h's #ifdef check for other graphics libraries doesn't 172 // Upstream Platform.h's #ifdef check for other graphics libraries doesn't
144 // check SKIA, so it falls back on defining CAIRO. Undo that here. 173 // check SKIA, so it falls back on defining CAIRO. Undo that here.
145 // TODO(evanm): clean this up. 174 // TODO(evanm): clean this up.
146 #undef WTF_PLATFORM_CAIRO 175 #undef WTF_PLATFORM_CAIRO
(...skipping 26 matching lines...) Expand all
173 #define WTF_USE_SAFARI_THEME 1 202 #define WTF_USE_SAFARI_THEME 1
174 #endif 203 #endif
175 204
176 #ifndef WEBCORE_NAVIGATOR_VENDOR 205 #ifndef WEBCORE_NAVIGATOR_VENDOR
177 #ifdef GOOGLE_CHROME_BUILD 206 #ifdef GOOGLE_CHROME_BUILD
178 #define WEBCORE_NAVIGATOR_VENDOR "Google Inc." 207 #define WEBCORE_NAVIGATOR_VENDOR "Google Inc."
179 #else 208 #else
180 #define WEBCORE_NAVIGATOR_VENDOR "" 209 #define WEBCORE_NAVIGATOR_VENDOR ""
181 #endif // ifdef GOOGLE_CHROME_BUILD 210 #endif // ifdef GOOGLE_CHROME_BUILD
182 #endif // ifndef WEBCORE_NAVIGATOR_VENDOR 211 #endif // ifndef WEBCORE_NAVIGATOR_VENDOR
OLDNEW
« 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