Title: [120122] trunk/Source
- Revision
- 120122
- Author
- commit-qu...@webkit.org
- Date
- 2012-06-12 14:39:14 -0700 (Tue, 12 Jun 2012)
Log Message
Source/WebCore: [chromium mac] Don't include things in subframeworks of
ApplicationServices.framework.
Subframeworks move around from SDK to SDK and OS release to OS
release, but just using the top-level umbrella framework guarantees
forward compatibility. When building for Chromium Mac, just #include
<ApplicationServices/ApplicationServices.h> instead of reaching in to
subframeworks.
https://bugs.webkit.org/show_bug.cgi?id=88569
Patch by Mark Mentovai <m...@chromium.org> on 2012-06-12
Reviewed by Stephen White.
No new tests.
* platform/graphics/GlyphBuffer.h:
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
* platform/graphics/skia/GraphicsContextSkia.cpp:
Source/WebKit/chromium: [chromium mac] Don't #include things in subframeworks of
ApplicationServices.framework.
#including the umbrella <ApplicatonServices/ApplicationServices.h>
exposed an ambiguous name, FontMetrics, that needs to be fully
qualified as WebCore::FontMetrics.
https://bugs.webkit.org/show_bug.cgi?id=88569
Patch by Mark Mentovai <m...@chromium.org> on 2012-06-12
Reviewed by Stephen White.
* src/WebFontImpl.cpp:
(WebKit::WebFontImpl::estimateTextBounds):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120121 => 120122)
--- trunk/Source/WebCore/ChangeLog 2012-06-12 21:15:43 UTC (rev 120121)
+++ trunk/Source/WebCore/ChangeLog 2012-06-12 21:39:14 UTC (rev 120122)
@@ -1,3 +1,24 @@
+2012-06-12 Mark Mentovai <m...@chromium.org>
+
+ [chromium mac] Don't include things in subframeworks of
+ ApplicationServices.framework.
+
+ Subframeworks move around from SDK to SDK and OS release to OS
+ release, but just using the top-level umbrella framework guarantees
+ forward compatibility. When building for Chromium Mac, just #include
+ <ApplicationServices/ApplicationServices.h> instead of reaching in to
+ subframeworks.
+
+ https://bugs.webkit.org/show_bug.cgi?id=88569
+
+ Reviewed by Stephen White.
+
+ No new tests.
+
+ * platform/graphics/GlyphBuffer.h:
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ * platform/graphics/skia/GraphicsContextSkia.cpp:
+
2012-06-12 Igor Oliveira <igo...@sisa.samsung.com>
Apply animations and transitions for first-letter element
Modified: trunk/Source/WebCore/platform/graphics/GlyphBuffer.h (120121 => 120122)
--- trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2012-06-12 21:15:43 UTC (rev 120121)
+++ trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2012-06-12 21:39:14 UTC (rev 120122)
@@ -35,11 +35,11 @@
#include <wtf/UnusedParam.h>
#include <wtf/Vector.h>
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG)
#include <CoreGraphics/CGGeometry.h>
#endif
-#if PLATFORM(WX) && OS(DARWIN)
+#if OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM))
#include <ApplicationServices/ApplicationServices.h>
#endif
@@ -62,7 +62,7 @@
// CG uses CGSize instead of FloatSize so that the result of advances()
// can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
typedef CGSize GlyphBufferAdvance;
#elif OS(WINCE)
// There is no cross-platform code that uses the height of GlyphBufferAdvance,
@@ -126,7 +126,7 @@
float advanceAt(int index) const
{
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
return m_advances[index].width;
#elif OS(WINCE)
return m_advances[index];
@@ -157,7 +157,7 @@
m_glyphs.append(glyph);
#endif
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
CGSize advance = { width, 0 };
m_advances.append(advance);
#elif OS(WINCE)
@@ -196,7 +196,7 @@
{
ASSERT(!isEmpty());
GlyphBufferAdvance& lastAdvance = m_advances.last();
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
lastAdvance.width += width;
#elif OS(WINCE)
lastAdvance += width;
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (120121 => 120122)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2012-06-12 21:15:43 UTC (rev 120121)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2012-06-12 21:39:14 UTC (rev 120122)
@@ -33,7 +33,7 @@
#include "TextRun.h"
#include "WebCoreSystemInterface.h"
-#if PLATFORM(WX)
+#if PLATFORM(WX) || PLATFORM(CHROMIUM)
#include <ApplicationServices/ApplicationServices.h>
#else
#include <CoreText/CoreText.h>
Modified: trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (120121 => 120122)
--- trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp 2012-06-12 21:15:43 UTC (rev 120121)
+++ trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp 2012-06-12 21:39:14 UTC (rev 120122)
@@ -56,7 +56,7 @@
#include <wtf/UnusedParam.h>
#if PLATFORM(CHROMIUM) && OS(DARWIN)
-#include <CoreGraphics/CGColorSpace.h>
+#include <ApplicationServices/ApplicationServices.h>
#endif
using namespace std;
Modified: trunk/Source/WebKit/chromium/ChangeLog (120121 => 120122)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-12 21:15:43 UTC (rev 120121)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-12 21:39:14 UTC (rev 120122)
@@ -1,3 +1,19 @@
+2012-06-12 Mark Mentovai <m...@chromium.org>
+
+ [chromium mac] Don't #include things in subframeworks of
+ ApplicationServices.framework.
+
+ #including the umbrella <ApplicatonServices/ApplicationServices.h>
+ exposed an ambiguous name, FontMetrics, that needs to be fully
+ qualified as WebCore::FontMetrics.
+
+ https://bugs.webkit.org/show_bug.cgi?id=88569
+
+ Reviewed by Stephen White.
+
+ * src/WebFontImpl.cpp:
+ (WebKit::WebFontImpl::estimateTextBounds):
+
2012-06-12 James Robinson <jam...@chromium.org>
[chromium] REGRESSION(119769): Canvas2DLayerBridge may go away before its TextureLayerChromium
Modified: trunk/Source/WebKit/chromium/src/WebFontImpl.cpp (120121 => 120122)
--- trunk/Source/WebKit/chromium/src/WebFontImpl.cpp 2012-06-12 21:15:43 UTC (rev 120121)
+++ trunk/Source/WebKit/chromium/src/WebFontImpl.cpp 2012-06-12 21:39:14 UTC (rev 120122)
@@ -148,7 +148,7 @@
{
FontCachePurgePreventer fontCachePurgePreventer;
int totalWidth = m_font.width(run, 0);
- const FontMetrics& fontMetrics = m_font.fontMetrics();
+ const WebCore::FontMetrics& fontMetrics = m_font.fontMetrics();
return WebRect(leftBaseline.x - (fontMetrics.ascent() + fontMetrics.descent()) / 2,
leftBaseline.y - fontMetrics.ascent() - fontMetrics.lineGap(),
totalWidth + fontMetrics.ascent() + fontMetrics.descent(),
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
