Diff
Modified: trunk/Source/WebCore/ChangeLog (145686 => 145687)
--- trunk/Source/WebCore/ChangeLog 2013-03-13 08:58:12 UTC (rev 145686)
+++ trunk/Source/WebCore/ChangeLog 2013-03-13 09:06:13 UTC (rev 145687)
@@ -1,3 +1,24 @@
+2013-03-13 Alberto Garcia <agar...@igalia.com>
+
+ [BlackBerry] FontPlatformData: remove TextOrientation parameter
+ https://bugs.webkit.org/show_bug.cgi?id=112135
+
+ Reviewed by Rob Buis.
+
+ This doesn't exist since r136520.
+
+ * platform/graphics/blackberry/FontCacheBlackBerry.cpp:
+ (WebCore::FontCache::createFontPlatformData):
+ * platform/graphics/blackberry/FontCustomPlatformData.h:
+ (FontCustomPlatformData):
+ * platform/graphics/blackberry/FontCustomPlatformDataBlackBerry.cpp:
+ (WebCore::FontCustomPlatformData::fontPlatformData):
+ * platform/graphics/blackberry/FontPlatformDataBlackBerry.cpp:
+ (WebCore::FontPlatformData::FontPlatformData):
+ (WebCore::FontPlatformData::applyState):
+ * platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp:
+ (WebCore::SimpleFontData::createScaledFontData):
+
2013-03-12 Antti Koivisto <an...@apple.com>
Basic child obscuration test for backgrounds
Modified: trunk/Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp (145686 => 145687)
--- trunk/Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp 2013-03-13 08:58:12 UTC (rev 145686)
+++ trunk/Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp 2013-03-13 09:06:13 UTC (rev 145687)
@@ -247,7 +247,7 @@
return 0;
// fprintf(stderr, " %s\n", name);
- return new FontPlatformData(name, fontDescription.computedSize(), shouldFakeBold, shouldFakeItalic, fontDescription.orientation(), fontDescription.textOrientation());
+ return new FontPlatformData(name, fontDescription.computedSize(), shouldFakeBold, shouldFakeItalic, fontDescription.orientation());
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/blackberry/FontCustomPlatformData.h (145686 => 145687)
--- trunk/Source/WebCore/platform/graphics/blackberry/FontCustomPlatformData.h 2013-03-13 08:58:12 UTC (rev 145686)
+++ trunk/Source/WebCore/platform/graphics/blackberry/FontCustomPlatformData.h 2013-03-13 09:06:13 UTC (rev 145687)
@@ -40,7 +40,7 @@
FontCustomPlatformData(FILECHAR* fontName, PassRefPtr<SharedBuffer>);
~FontCustomPlatformData();
- FontPlatformData fontPlatformData(int size, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight,
+ FontPlatformData fontPlatformData(int size, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal,
FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
static bool supportsFormat(const String&);
Modified: trunk/Source/WebCore/platform/graphics/blackberry/FontCustomPlatformDataBlackBerry.cpp (145686 => 145687)
--- trunk/Source/WebCore/platform/graphics/blackberry/FontCustomPlatformDataBlackBerry.cpp 2013-03-13 08:58:12 UTC (rev 145686)
+++ trunk/Source/WebCore/platform/graphics/blackberry/FontCustomPlatformDataBlackBerry.cpp 2013-03-13 09:06:13 UTC (rev 145687)
@@ -42,9 +42,9 @@
free(m_fontName);
}
-FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, TextOrientation textOrientation, FontWidthVariant widthVariant, FontRenderingMode)
+FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVariant, FontRenderingMode)
{
- return FontPlatformData(m_fontName, size, syntheticBold, syntheticItalic, orientation, textOrientation, widthVariant);
+ return FontPlatformData(m_fontName, size, syntheticBold, syntheticItalic, orientation, widthVariant);
}
bool FontCustomPlatformData::supportsFormat(const String& format)
Modified: trunk/Source/WebCore/platform/graphics/blackberry/FontPlatformDataBlackBerry.cpp (145686 => 145687)
--- trunk/Source/WebCore/platform/graphics/blackberry/FontPlatformDataBlackBerry.cpp 2013-03-13 08:58:12 UTC (rev 145686)
+++ trunk/Source/WebCore/platform/graphics/blackberry/FontPlatformDataBlackBerry.cpp 2013-03-13 09:06:13 UTC (rev 145687)
@@ -28,11 +28,10 @@
namespace WebCore {
-FontPlatformData::FontPlatformData(FILECHAR* name, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, TextOrientation textOrientation, FontWidthVariant widthVariant)
+FontPlatformData::FontPlatformData(FILECHAR* name, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
: m_syntheticBold(syntheticBold)
, m_syntheticOblique(syntheticOblique)
, m_orientation(orientation)
- , m_textOrientation(textOrientation)
, m_size(size)
, m_widthVariant(widthVariant)
, m_font(0)
@@ -101,7 +100,7 @@
return false;
if (m_orientation == Vertical) {
- if (FS_set_flags(font, (m_textOrientation == TextOrientationVerticalRight) ? FLAGS_VERTICAL_ROTATE_LEFT_ON : FLAGS_VERTICAL_ON) != SUCCESS)
+ if (FS_set_flags(font, FLAGS_VERTICAL_ON) != SUCCESS)
return false;
}
return true;
Modified: trunk/Source/WebCore/platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp (145686 => 145687)
--- trunk/Source/WebCore/platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp 2013-03-13 08:58:12 UTC (rev 145686)
+++ trunk/Source/WebCore/platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp 2013-03-13 09:06:13 UTC (rev 145687)
@@ -116,7 +116,6 @@
m_platformData.syntheticBold(),
m_platformData.syntheticOblique(),
m_platformData.orientation(),
- m_platformData.textOrientation(),
m_platformData.widthVariant()),
isCustomFont(), false));
}
