Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (89495 => 89496)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-22 23:55:53 UTC (rev 89496)
@@ -1,3 +1,14 @@
+2011-06-22 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r89489.
+ http://trac.webkit.org/changeset/89489
+ https://bugs.webkit.org/show_bug.cgi?id=63203
+
+ Broke chromium mac build on build.webkit.org (Requested by
+ abarth on #webkit).
+
+ * wtf/Platform.h:
+
2011-06-22 Cary Clark <carycl...@google.com>
Reviewed by Darin Fisher.
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (89495 => 89496)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -543,14 +543,10 @@
#define WTF_USE_CA 1
#endif
-/* USE(SKIA) for Win/Linux, CG for Mac, unless enabled */
+/* USE(SKIA) for Win/Linux, CG for Mac */
#if PLATFORM(CHROMIUM)
#if OS(DARWIN)
-#if USE(SKIA_ON_MAC_CHROMIUM)
-#define WTF_USE_SKIA 1
-#else
#define WTF_USE_CG 1
-#endif
#define WTF_USE_ATSUI 1
#define WTF_USE_CORE_TEXT 1
#define WTF_USE_ICCJPEG 1
Modified: trunk/Source/WebCore/ChangeLog (89495 => 89496)
--- trunk/Source/WebCore/ChangeLog 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/ChangeLog 2011-06-22 23:55:53 UTC (rev 89496)
@@ -1,3 +1,40 @@
+2011-06-22 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r89489.
+ http://trac.webkit.org/changeset/89489
+ https://bugs.webkit.org/show_bug.cgi?id=63203
+
+ Broke chromium mac build on build.webkit.org (Requested by
+ abarth on #webkit).
+
+ * WebCore.gyp/WebCore.gyp:
+ * loader/cache/CachedFont.cpp:
+ * platform/chromium/DragImageRef.h:
+ * platform/graphics/FloatPoint.h:
+ * platform/graphics/FloatRect.h:
+ * platform/graphics/FloatSize.h:
+ * platform/graphics/FontPlatformData.h:
+ (WebCore::FontPlatformData::hash):
+ * platform/graphics/GlyphBuffer.h:
+ (WebCore::GlyphBuffer::advanceAt):
+ (WebCore::GlyphBuffer::add):
+ (WebCore::GlyphBuffer::expandLastAdvance):
+ * platform/graphics/IntPoint.h:
+ * platform/graphics/IntRect.h:
+ * platform/graphics/IntSize.h:
+ * platform/graphics/SimpleFontData.h:
+ * platform/graphics/cg/FloatPointCG.cpp:
+ * platform/graphics/cg/FloatRectCG.cpp:
+ * platform/graphics/cg/FloatSizeCG.cpp:
+ * platform/graphics/cg/IntPointCG.cpp:
+ * platform/graphics/cg/IntRectCG.cpp:
+ * platform/graphics/cg/IntSizeCG.cpp:
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
+ (WebCore::createFontCustomPlatformData):
+ * platform/graphics/mac/FontCustomPlatformData.h:
+ (WebCore::FontCustomPlatformData::FontCustomPlatformData):
+
2011-06-22 Luke Macpherson <macpher...@chromium.org>
Reviewed by James Robinson.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (89495 => 89496)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -260,7 +260,7 @@
'<@(webcore_svg_bindings_idl_files)',
],
}],
- ['OS=="mac" and use_skia==0', {
+ ['OS=="mac"', {
'webcore_include_dirs+': [
# platform/graphics/cg and cocoa need to come before
# platform/graphics/chromium so that the Mac build picks up the
@@ -271,8 +271,6 @@
'../platform/graphics/cocoa',
'../platform/graphics/cg',
],
- }],
- ['OS=="mac"', {
'webcore_include_dirs': [
# FIXME: Eliminate dependency on platform/mac and related
# directories.
@@ -286,12 +284,6 @@
'../platform/text/mac',
],
}],
- ['OS=="mac" and use_skia==1', {
- 'webcore_include_dirs': [
- '../platform/graphics/cocoa',
- '../platform/graphics/cg',
- ],
- }],
['OS=="win"', {
'webcore_include_dirs': [
'../page/win',
@@ -1339,15 +1331,7 @@
'<(chromium_src_dir)/third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
],
}],
- ['OS=="mac" and use_skia==0', {
- 'sources/': [
- # The Mac build is PLATFORM_CG too. platform/graphics/cg is the
- # only place that CG files we want to build are located, and not
- # all of them even have a CG suffix, so just add them by a
- # regexp matching their directory.
- ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
- ],
- }],['OS=="mac"', {
+ ['OS=="mac"', {
# Necessary for Mac .mm stuff.
'include_dirs': [
'../../../WebKitLibraries',
@@ -1377,6 +1361,12 @@
['include', 'CF\\.cpp$'],
['exclude', 'network/cf/'],
+ # The Mac build is PLATFORM_CG too. platform/graphics/cg is the
+ # only place that CG files we want to build are located, and not
+ # all of them even have a CG suffix, so just add them by a
+ # regexp matching their directory.
+ ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
+
# Use native Mac font code from WebCore.
['include', 'platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'],
['include', 'platform/graphics/mac/ComplexText[^/]*\\.(cpp|h)$'],
@@ -1393,6 +1383,7 @@
['include', 'platform/graphics/mac/FloatRectMac\\.mm$'],
['include', 'platform/graphics/mac/FloatSizeMac\\.mm$'],
['include', 'platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'],
+ ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
['include', 'platform/graphics/mac/IntPointMac\\.mm$'],
['include', 'platform/graphics/mac/IntRectMac\\.mm$'],
['include', 'platform/mac/BlockExceptions\\.mm$'],
@@ -1408,6 +1399,9 @@
['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
+ # Chromium Mac does not use skia.
+ ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
+
# The Mac uses platform/mac/KillRingMac.mm instead of the dummy
# implementation.
['exclude', 'platform/KillRingNone\\.cpp$'],
@@ -1420,34 +1414,15 @@
# related to ScrollbarThemeChromium.cpp.
['exclude', 'platform/chromium/ScrollbarThemeChromium\\.cpp$'],
+ # The Mac currently uses ImageChromiumMac.mm from
+ # platform/graphics/chromium, included by regex above, instead.
+ ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],
+
# The Mac does not use ImageSourceCG.cpp from platform/graphics/cg
# even though it is included by regex above.
['exclude', 'platform/graphics/cg/ImageSourceCG\\.cpp$'],
['exclude', 'platform/graphics/cg/PDFDocumentImage\\.cpp$'],
- ['include', '/chrome/junk\\.txt$'],
- ],
- },{ # OS!="mac"
- 'sources/': [
- # FIXME: We will eventually compile this too, but for now it's
- # only used on mac.
- ['exclude', 'platform/graphics/FontPlatformData\\.cpp$'],
- ],
- }],
- ['OS=="mac" and use_skia==0', {
- 'sources/': [
- # Cherry-pick some files that can't be included by broader regexps.
- # Some of these are used instead of Chromium platform files, see
- # the specific exclusions in the "sources!" list below.
- ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
-
- # Chromium Mac does not use skia.
- ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
-
- # The Mac currently uses ImageChromiumMac.mm from
- # platform/graphics/chromium, included by regex above, instead.
- ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],
-
# ImageDecoderSkia is not used on mac. ImageDecoderCG is used instead.
['exclude', 'platform/image-decoders/skia/ImageDecoderSkia\\.cpp$'],
['include', 'platform/image-decoders/cg/ImageDecoderCG\\.cpp$'],
@@ -1455,39 +1430,26 @@
# Again, Skia is not used on Mac.
['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
],
- }],
- ['OS=="mac" and use_skia==1', {
+ },{ # OS!="mac"
'sources/': [
- ['include', 'platform/graphics/cg/FloatPointCG\\.cpp$'],
- ['include', 'platform/graphics/cg/FloatRectCG\\.cpp$'],
- ['include', 'platform/graphics/cg/FloatSizeCG\\.cpp$'],
- ['include', 'platform/graphics/cg/IntPointCG\\.cpp$'],
- ['include', 'platform/graphics/cg/IntRectCG\\.cpp$'],
- ['include', 'platform/graphics/cg/IntSizeCG\\.cpp$'],
- ['exclude', 'platform/graphics/mac/FontMac\\.mm$'],
- ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
- ['exclude', 'platform/chromium/DragImageChromiumMac\\.cpp$'],
+ # FIXME: We will eventually compile this too, but for now it's
+ # only used on mac.
+ ['exclude', 'platform/graphics/FontPlatformData\\.cpp$'],
+
+ # Linux uses FontLinux; Windows uses FontWin. Additionally, FontSkia
+ # is excluded by a rule above if WebKit uses CG instead of Skia.
+ ['exclude', 'platform/graphics/skia/FontSkia\\.cpp$'],
],
}],
['toolkit_uses_gtk == 0', {
'sources/': [
['exclude', '(Gtk|Linux)\\.cpp$'],
['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
- ],
- }],
- ['toolkit_uses_gtk == 0 and use_skia==0', {
- 'sources/': [
['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
],
}],
['OS!="mac"', {
- 'sources/': [
- ['exclude', 'Mac\\.(cpp|mm?)$'],
-
- # Linux uses FontLinux; Windows uses FontWin. Additionally, FontSkia
- # is excluded by a rule above if WebKit uses CG instead of Skia.
- ['exclude', 'platform/graphics/skia/FontSkia\\.cpp$'],
- ],
+ 'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]
}],
['OS!="win"', {
'sources/': [
Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (89495 => 89496)
--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -28,7 +28,7 @@
#include "CachedFont.h"
// FIXME: This should really be a blacklist instead of a whitelist
-#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
+#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROME))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
#define STORE_FONT_CUSTOM_PLATFORM_DATA
#endif
Modified: trunk/Source/WebCore/platform/chromium/DragImageRef.h (89495 => 89496)
--- trunk/Source/WebCore/platform/chromium/DragImageRef.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/chromium/DragImageRef.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -29,7 +29,7 @@
#ifndef DragImageRef_h
#define DragImageRef_h
-#if USE(CG)
+#if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME)
typedef struct CGImage* CGImageRef;
#else
class SkBitmap;
@@ -37,7 +37,7 @@
namespace WebCore {
-#if USE(CG)
+#if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME)
typedef CGImageRef DragImageRef;
#else
typedef SkBitmap* DragImageRef;
Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -31,7 +31,7 @@
#include "IntPoint.h"
#include <wtf/MathExtras.h>
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
typedef struct CGPoint CGPoint;
#endif
@@ -125,7 +125,7 @@
return FloatPoint(std::max(m_x, other.m_x), std::max(m_y, other.m_y));
}
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
FloatPoint(const CGPoint&);
operator CGPoint() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -29,7 +29,7 @@
#include "FloatPoint.h"
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
typedef struct CGRect CGRect;
#endif
@@ -139,7 +139,7 @@
void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2);
void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3);
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
FloatRect(const CGRect&);
operator CGRect() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -31,7 +31,7 @@
#include "IntPoint.h"
#include <wtf/MathExtras.h>
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
typedef struct CGSize CGSize;
#endif
@@ -91,7 +91,7 @@
return m_width * m_width + m_height * m_height;
}
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
operator CGSize() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -82,7 +82,7 @@
typedef struct HFONT__* HFONT;
#endif
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
typedef struct CGFont* CGFontRef;
#if OS(DARWIN)
typedef const struct __CTFont* CTFontRef;
@@ -176,7 +176,7 @@
#if OS(DARWIN)
FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal,
TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
TextOrientation textOrientation, FontWidthVariant widthVariant)
: m_syntheticBold(syntheticBold)
@@ -212,7 +212,7 @@
void setFont(NSFont*);
#endif
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
#if OS(DARWIN)
CGFontRef cgFont() const { return m_cgFont.get(); }
CTFontRef ctFont() const;
@@ -245,7 +245,7 @@
#if PLATFORM(WIN) && !USE(CAIRO)
return m_font ? m_font->hash() : 0;
#elif OS(DARWIN)
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
ASSERT(m_font || !m_cgFont);
#endif
uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, m_textOrientation << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique };
@@ -321,7 +321,7 @@
RefPtr<RefCountedGDIHandle<HFONT> > m_font;
#endif
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
#if PLATFORM(WIN)
RetainPtr<CGFontRef> m_cgFont;
#else
Modified: trunk/Source/WebCore/platform/graphics/GlyphBuffer.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/GlyphBuffer.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -35,7 +35,7 @@
#include <wtf/UnusedParam.h>
#include <wtf/Vector.h>
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
#include <CoreGraphics/CGGeometry.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) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
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) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
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) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
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) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
lastAdvance.width += width;
#elif OS(WINCE)
lastAdvance += width;
Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -33,7 +33,7 @@
#include <QDataStream>
#endif
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
typedef struct CGPoint CGPoint;
#endif
@@ -121,7 +121,7 @@
return IntPoint(m_y, m_x);
}
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
explicit IntPoint(const CGPoint&); // don't do this implicitly since it's lossy
operator CGPoint() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/IntRect.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -29,7 +29,7 @@
#include "IntPoint.h"
#include <wtf/Vector.h>
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
typedef struct CGRect CGRect;
#endif
@@ -202,7 +202,7 @@
operator cairo_rectangle_int_t() const;
#endif
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
operator CGRect() const;
#endif
@@ -248,7 +248,7 @@
return a.location() != b.location() || a.size() != b.size();
}
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
IntRect enclosingIntRect(const CGRect&);
#endif
Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/IntSize.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -26,7 +26,7 @@
#ifndef IntSize_h
#define IntSize_h
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
typedef struct CGSize CGSize;
#endif
@@ -109,7 +109,7 @@
return IntSize(m_height, m_width);
}
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
explicit IntSize(const CGSize&); // don't do this implicitly since it's lossy
operator CGSize() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -132,7 +132,7 @@
float spaceWidth() const { return m_spaceWidth; }
void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
#endif
@@ -264,7 +264,7 @@
mutable OwnPtr<DerivedFontData> m_derivedFontData;
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
float m_syntheticBoldOffset;
#endif
Modified: trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -27,7 +27,7 @@
#include "config.h"
#include "FloatPoint.h"
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
#include <ApplicationServices/ApplicationServices.h>
Modified: trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -27,7 +27,7 @@
#include "config.h"
#include "FloatRect.h"
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
#include <ApplicationServices/ApplicationServices.h>
Modified: trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -27,7 +27,7 @@
#include "config.h"
#include "FloatSize.h"
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) || (PLATFORM(QT) && USE(QTKIT))
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME) || (PLATFORM(QT) && USE(QTKIT))
#include <ApplicationServices/ApplicationServices.h>
Modified: trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -26,7 +26,7 @@
#include "config.h"
#include "IntPoint.h"
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
#include <ApplicationServices/ApplicationServices.h>
Modified: trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -26,7 +26,7 @@
#include "config.h"
#include "IntRect.h"
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) || (PLATFORM(QT) && USE(QTKIT))
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME) || (PLATFORM(QT) && USE(QTKIT))
#include <ApplicationServices/ApplicationServices.h>
Modified: trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -26,7 +26,7 @@
#include "config.h"
#include "IntSize.h"
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
#include <ApplicationServices/ApplicationServices.h>
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -27,14 +27,14 @@
#include "WOFFFileFormat.h"
#include <ApplicationServices/ApplicationServices.h>
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
#include "SkStream.h"
#include "SkTypeface.h"
#endif
namespace WebCore {
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
class RemoteFontStream : public SkStream {
public:
explicit RemoteFontStream(PassRefPtr<SharedBuffer> buffer)
@@ -82,7 +82,7 @@
if (m_atsContainer)
ATSFontDeactivate(m_atsContainer, NULL, kATSOptionFlagsDefault);
#endif
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
SkSafeUnref(m_typeface);
#endif
CGFontRelease(m_cgFont);
@@ -160,7 +160,7 @@
#endif // !defined(BUILDING_ON_LEOPARD)
FontCustomPlatformData* fontCustomPlatformData = new FontCustomPlatformData(containerRef, cgFontRef.releaseRef());
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
RemoteFontStream* stream = new RemoteFontStream(buffer);
fontCustomPlatformData->m_typeface = SkTypeface::CreateFromStream(stream);
#endif
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h (89495 => 89496)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -33,7 +33,7 @@
typedef UInt32 ATSFontContainerRef;
typedef UInt32 ATSFontRef;
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
struct SkTypeface;
#endif
@@ -48,7 +48,7 @@
FontCustomPlatformData(ATSFontContainerRef container, CGFontRef cgFont)
: m_atsContainer(container)
, m_cgFont(cgFont)
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
, m_typeface(0)
#endif
{
@@ -62,7 +62,7 @@
ATSFontContainerRef m_atsContainer;
CGFontRef m_cgFont;
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
SkTypeface* m_typeface;
#endif
};
Modified: trunk/Source/WebKit/chromium/ChangeLog (89495 => 89496)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-22 23:55:53 UTC (rev 89496)
@@ -1,3 +1,16 @@
+2011-06-22 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r89489.
+ http://trac.webkit.org/changeset/89489
+ https://bugs.webkit.org/show_bug.cgi?id=63203
+
+ Broke chromium mac build on build.webkit.org (Requested by
+ abarth on #webkit).
+
+ * WebKit.gyp:
+ * features.gypi:
+ * public/WebCommon.h:
+
2011-06-22 Cary Clark <carycl...@google.com>
Reviewed by Darin Fisher.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (89495 => 89496)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-06-22 23:55:53 UTC (rev 89496)
@@ -684,16 +684,8 @@
'include_dirs': [
'public/mac',
],
- 'conditions': [
- ['use_skia==0', {
- 'sources/': [
- ['exclude', 'Skia\\.cpp$'],
- ],
- },{ # use_skia
- 'sources/': [
- ['exclude', 'CG\\.cpp$'],
- ],
- }],
+ 'sources/': [
+ ['exclude', 'Skia\\.cpp$'],
],
}, { # else: OS!="mac"
'sources/': [
Modified: trunk/Source/WebKit/chromium/features.gypi (89495 => 89496)
--- trunk/Source/WebKit/chromium/features.gypi 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-06-22 23:55:53 UTC (rev 89496)
@@ -105,7 +105,6 @@
'enable_svg%': 1,
'enable_touch_events%': 1,
'use_skia_gpu%': 0,
- 'use_skia%': 0,
'enable_touch_icon_loading%' : 0,
'enable_smooth_scrolling%': 0,
'enable_css3_flexbox%': 0,
@@ -122,7 +121,7 @@
'ENABLE_3D_RENDERING=1',
],
}],
- ['use_accelerated_compositing==1 and (OS!="mac" or use_skia==1)', {
+ ['use_accelerated_compositing==1 and OS!="mac"', {
'feature_defines': [
'ENABLE_ACCELERATED_2D_CANVAS=1',
],
@@ -148,18 +147,12 @@
'feature_defines': [
'WTF_USE_WEBAUDIO_FFMPEG=1',
],
- 'use_skia%': 1,
}],
['enable_register_protocol_handler==1', {
'feature_defines': [
'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
],
}],
- ['OS=="mac"', {
- 'feature_defines': [
- 'WTF_USE_SKIA_ON_MAC_CHROMIUM=<(use_skia)',
- ],
- }],
['enable_smooth_scrolling==1', {
'feature_defines': [
'ENABLE_SMOOTH_SCROLLING=1',
Modified: trunk/Source/WebKit/chromium/public/WebCommon.h (89495 => 89496)
--- trunk/Source/WebKit/chromium/public/WebCommon.h 2011-06-22 23:53:17 UTC (rev 89495)
+++ trunk/Source/WebKit/chromium/public/WebCommon.h 2011-06-22 23:55:53 UTC (rev 89496)
@@ -39,7 +39,7 @@
#endif
#if !defined(WEBKIT_USING_SKIA)
- #if !defined(__APPLE__) || defined(USE_SKIA)
+ #if !defined(__APPLE__)
#define WEBKIT_USING_SKIA 1
#else
#define WEBKIT_USING_SKIA 0
