Title: [125885] trunk/Source/WebKit/efl
- Revision
- 125885
- Author
- [email protected]
- Date
- 2012-08-17 05:23:18 -0700 (Fri, 17 Aug 2012)
Log Message
[EFL] Change font family/script on layout tests causes flakiness
https://bugs.webkit.org/show_bug.cgi?id=94327
Patch by Thiago Marcos P. Santos <[email protected]> on 2012-08-17
Reviewed by Kenneth Rohde Christiansen.
Always set the font on WebCore even if the font family is the same. It
has to be done because the script value might have also changed.
Settings::set*FontFamily() has an implicit UScriptCode
parameter that will set the script back to the defaults.
* ewk/ewk_view.cpp:
(ewk_view_font_family_name_set):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (125884 => 125885)
--- trunk/Source/WebKit/efl/ChangeLog 2012-08-17 12:22:37 UTC (rev 125884)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-08-17 12:23:18 UTC (rev 125885)
@@ -1,3 +1,18 @@
+2012-08-17 Thiago Marcos P. Santos <[email protected]>
+
+ [EFL] Change font family/script on layout tests causes flakiness
+ https://bugs.webkit.org/show_bug.cgi?id=94327
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Always set the font on WebCore even if the font family is the same. It
+ has to be done because the script value might have also changed.
+ Settings::set*FontFamily() has an implicit UScriptCode
+ parameter that will set the script back to the defaults.
+
+ * ewk/ewk_view.cpp:
+ (ewk_view_font_family_name_set):
+
2012-08-14 Adam Barth <[email protected]>
Delete Frame::domWindow() and Frame::existingDOMWindow()
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (125884 => 125885)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-08-17 12:22:37 UTC (rev 125884)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-08-17 12:23:18 UTC (rev 125885)
@@ -2502,28 +2502,28 @@
switch (fontFamily) {
case EWK_FONT_FAMILY_STANDARD:
- if (eina_stringshare_replace(&priv->settings.fontStandard, name))
- priv->pageSettings->setStandardFontFamily(AtomicString::fromUTF8(name));
+ eina_stringshare_replace(&priv->settings.fontStandard, name);
+ priv->pageSettings->setStandardFontFamily(AtomicString::fromUTF8(name));
break;
case EWK_FONT_FAMILY_CURSIVE:
- if (eina_stringshare_replace(&priv->settings.fontCursive, name))
- priv->pageSettings->setCursiveFontFamily(AtomicString::fromUTF8(name));
+ eina_stringshare_replace(&priv->settings.fontCursive, name);
+ priv->pageSettings->setCursiveFontFamily(AtomicString::fromUTF8(name));
break;
case EWK_FONT_FAMILY_FANTASY:
- if (eina_stringshare_replace(&priv->settings.fontFantasy, name))
- priv->pageSettings->setFantasyFontFamily(AtomicString::fromUTF8(name));
+ eina_stringshare_replace(&priv->settings.fontFantasy, name);
+ priv->pageSettings->setFantasyFontFamily(AtomicString::fromUTF8(name));
break;
case EWK_FONT_FAMILY_MONOSPACE:
- if (eina_stringshare_replace(&priv->settings.fontMonospace, name))
- priv->pageSettings->setFixedFontFamily(AtomicString::fromUTF8(name));
+ eina_stringshare_replace(&priv->settings.fontMonospace, name);
+ priv->pageSettings->setFixedFontFamily(AtomicString::fromUTF8(name));
break;
case EWK_FONT_FAMILY_SERIF:
- if (eina_stringshare_replace(&priv->settings.fontSerif, name))
- priv->pageSettings->setSerifFontFamily(AtomicString::fromUTF8(name));
+ eina_stringshare_replace(&priv->settings.fontSerif, name);
+ priv->pageSettings->setSerifFontFamily(AtomicString::fromUTF8(name));
break;
case EWK_FONT_FAMILY_SANS_SERIF:
- if (eina_stringshare_replace(&priv->settings.fontSansSerif, name))
- priv->pageSettings->setSansSerifFontFamily(AtomicString::fromUTF8(name));
+ eina_stringshare_replace(&priv->settings.fontSansSerif, name);
+ priv->pageSettings->setSansSerifFontFamily(AtomicString::fromUTF8(name));
break;
default:
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
