[BlackBerry] FontPlatformData: remove TextOrientation parameter
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Mar 2013 09:06:13 +0000 (09:06 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Mar 2013 09:06:13 +0000 (09:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=112135

Patch by Alberto Garcia <agarcia@igalia.com> on 2013-03-13
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@145687 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/blackberry/FontCacheBlackBerry.cpp
Source/WebCore/platform/graphics/blackberry/FontCustomPlatformData.h
Source/WebCore/platform/graphics/blackberry/FontCustomPlatformDataBlackBerry.cpp
Source/WebCore/platform/graphics/blackberry/FontPlatformDataBlackBerry.cpp
Source/WebCore/platform/graphics/blackberry/SimpleFontDataBlackBerry.cpp

index 7baf35c..108093d 100644 (file)
@@ -1,3 +1,24 @@
+2013-03-13  Alberto Garcia  <agarcia@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  <antti@apple.com>
 
         Basic child obscuration test for backgrounds
index 2aec6a1..593e9ff 100644 (file)
@@ -247,7 +247,7 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD
         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
index ca2dab0..b51a14e 100644 (file)
@@ -40,7 +40,7 @@ public:
     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&);
index 5667d8f..d16784c 100644 (file)
@@ -42,9 +42,9 @@ FontCustomPlatformData::~FontCustomPlatformData()
     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)
index 8b315f1..fedc98d 100644 (file)
 
 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 @@ bool FontPlatformData::applyState(FS_STATE* font, float scale) const
         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;
index 6c5eebb..e694dd1 100644 (file)
@@ -116,7 +116,6 @@ PassRefPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescri
             m_platformData.syntheticBold(),
             m_platformData.syntheticOblique(),
             m_platformData.orientation(),
-            m_platformData.textOrientation(),
             m_platformData.widthVariant()),
         isCustomFont(), false));
 }