Changeset 133808 in webkit

Timestamp:

Nov 7, 2012 2:48:24 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Update BB10 form theme.
​https://bugs.webkit.org/show_bug.cgi?id=100760

Patch by Tiancheng Jiang <​tijiang@rim.com> on 2012-11-07
Reviewed by Rob Buis.

RIM PR 236997
Internally Reviewed by Jakob Petsovits.

Set font family to fix DRT test fast/forms/input-type-text-min-width.html

• platform/blackberry/RenderThemeBlackBerry.cpp:

(WebCore::RenderThemeBlackBerry::defaultGUIFont):
(WebCore):
(WebCore::RenderThemeBlackBerry::systemFont):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/blackberry/RenderThemeBlackBerry.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-07  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry] Update BB10 form theme.
+        https://bugs.webkit.org/show_bug.cgi?id=100760
+
+        Reviewed by Rob Buis.
+
+        RIM PR 236997
+        Internally Reviewed by Jakob Petsovits.
+
+        Set font family to fix DRT test fast/forms/input-type-text-min-width.html
+
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore::RenderThemeBlackBerry::defaultGUIFont):
+        (WebCore):
+        (WebCore::RenderThemeBlackBerry::systemFont):
+
 2012-11-07  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp

@@ -130 +130 @@
 float RenderThemeBlackBerry::defaultFontSize = 16;
 
+const String& RenderThemeBlackBerry::defaultGUIFont()
+{
+    DEFINE_STATIC_LOCAL(String, fontFace, (ASCIILiteral("Slate Pro")));
+    return fontFace;
+}
+
 static PassRefPtr<Gradient> createLinearGradient(RGBA32 top, RGBA32 bottom, const IntPoint& a, const IntPoint& b)
 {
@@ -283 +289 @@
     }
 
+    fontDescription.firstFamily().setFamily(defaultGUIFont());
     fontDescription.setSpecifiedSize(fontSize);
     fontDescription.setIsAbsoluteSize(true);
-    fontDescription.setGenericFamily(FontDescription::SansSerifFamily);
+    fontDescription.setGenericFamily(FontDescription::NoFamily);
     fontDescription.setWeight(FontWeightNormal);
     fontDescription.setItalic(false);