Title: [134165] trunk/Source/WebCore
- Revision
- 134165
- Author
- [email protected]
- Date
- 2012-11-10 15:36:04 -0800 (Sat, 10 Nov 2012)
Log Message
Including <CoreText/CoreText.h> breaks the chromium/mac build.
https://bugs.webkit.org/show_bug.cgi?id=101851
Reviewed by Dan Bernstein.
r134146 introduced inclusion of 'CoreText/CoreText.h' in
SimpleFontDataCoreText.cpp, which broke the chromium/mac build. Grepping
around, it looks like this needs to be modified to include
'ApplicationServices/ApplicationServices.h'.
* platform/graphics/mac/SimpleFontDataCoreText.cpp:
Drop 'CoreText.h' in favor of 'ApplicationServices.h'.
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
Drop the platform-specific '#if' logic; just include 'ApplicationServices.h'.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134164 => 134165)
--- trunk/Source/WebCore/ChangeLog 2012-11-10 23:33:29 UTC (rev 134164)
+++ trunk/Source/WebCore/ChangeLog 2012-11-10 23:36:04 UTC (rev 134165)
@@ -1,3 +1,20 @@
+2012-11-10 Mike West <[email protected]>
+
+ Including <CoreText/CoreText.h> breaks the chromium/mac build.
+ https://bugs.webkit.org/show_bug.cgi?id=101851
+
+ Reviewed by Dan Bernstein.
+
+ r134146 introduced inclusion of 'CoreText/CoreText.h' in
+ SimpleFontDataCoreText.cpp, which broke the chromium/mac build. Grepping
+ around, it looks like this needs to be modified to include
+ 'ApplicationServices/ApplicationServices.h'.
+
+ * platform/graphics/mac/SimpleFontDataCoreText.cpp:
+ Drop 'CoreText.h' in favor of 'ApplicationServices.h'.
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ Drop the platform-specific '#if' logic; just include 'ApplicationServices.h'.
+
2012-11-10 Andreas Kling <[email protected]>
Don't detach from shared ElementAttributeData when overwriting attribute with identical value.
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (134164 => 134165)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2012-11-10 23:33:29 UTC (rev 134164)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2012-11-10 23:36:04 UTC (rev 134165)
@@ -31,11 +31,7 @@
#include "TextRun.h"
#include "WebCoreSystemInterface.h"
-#if PLATFORM(WX) || PLATFORM(CHROMIUM)
#include <ApplicationServices/ApplicationServices.h>
-#else
-#include <CoreText/CoreText.h>
-#endif
#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
// The following symbols are SPI in 10.5.
Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp (134164 => 134165)
--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp 2012-11-10 23:33:29 UTC (rev 134164)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp 2012-11-10 23:36:04 UTC (rev 134165)
@@ -27,7 +27,7 @@
#include "config.h"
#include "SimpleFontData.h"
-#include <CoreText/CoreText.h>
+#include <ApplicationServices/ApplicationServices.h>
namespace WebCore {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
