Skip to content
Permalink
Browse files
[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):

Canonical link: https://commits.webkit.org/119605@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@133808 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Tiancheng Jiang authored and webkit-commit-queue committed Nov 7, 2012
1 parent c284be2 commit 314a7bcb102aafe0e20ea42a90957010c3f7342f
Showing 2 changed files with 25 additions and 1 deletion.
@@ -1,3 +1,20 @@
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>

https://bugs.webkit.org/show_bug.cgi?id=101303
@@ -129,6 +129,12 @@ const RGBA32 activeTextColor = 0xfffafafa;

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)
{
RefPtr<Gradient> gradient = Gradient::create(a, b);
@@ -282,9 +288,10 @@ void RenderThemeBlackBerry::systemFont(int propId, FontDescription& fontDescript
fontSize -= (2.0f / pointsPerInch) * pixelsPerInch;
}

fontDescription.firstFamily().setFamily(defaultGUIFont());
fontDescription.setSpecifiedSize(fontSize);
fontDescription.setIsAbsoluteSize(true);
fontDescription.setGenericFamily(FontDescription::SansSerifFamily);
fontDescription.setGenericFamily(FontDescription::NoFamily);
fontDescription.setWeight(FontWeightNormal);
fontDescription.setItalic(false);
}

0 comments on commit 314a7bc

Please sign in to comment.