Title: [150750] trunk/Source/WebCore
- Revision
- 150750
- Author
- allan.jen...@digia.com
- Date
- 2013-05-27 05:48:18 -0700 (Mon, 27 May 2013)
Log Message
[Qt] REGRESSION(r150716): It made 15 inspector and 1 mozilla test to assert
https://bugs.webkit.org/show_bug.cgi?id=116822
Reviewed by Andreas Kling.
The input fontDescription may have more than one family defined.
* platform/qt/RenderThemeQStyle.cpp:
(WebCore::RenderThemeQStyle::adjustButtonStyle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150749 => 150750)
--- trunk/Source/WebCore/ChangeLog 2013-05-27 12:33:03 UTC (rev 150749)
+++ trunk/Source/WebCore/ChangeLog 2013-05-27 12:48:18 UTC (rev 150750)
@@ -1,3 +1,15 @@
+2013-05-27 Allan Sandfeld Jensen <allan.jen...@digia.com>
+
+ [Qt] REGRESSION(r150716): It made 15 inspector and 1 mozilla test to assert
+ https://bugs.webkit.org/show_bug.cgi?id=116822
+
+ Reviewed by Andreas Kling.
+
+ The input fontDescription may have more than one family defined.
+
+ * platform/qt/RenderThemeQStyle.cpp:
+ (WebCore::RenderThemeQStyle::adjustButtonStyle):
+
2013-05-27 Jocelyn Turcotte <jocelyn.turco...@digia.com>
[Qt][Win] Input events aren't mapped properly with windowless plugins.
Modified: trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp (150749 => 150750)
--- trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp 2013-05-27 12:33:03 UTC (rev 150749)
+++ trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp 2013-05-27 12:48:18 UTC (rev 150750)
@@ -250,7 +250,9 @@
fontDescription.setComputedSize(style->fontSize());
#endif
- fontDescription.setOneFamily(m_buttonFontFamily);
+ Vector<AtomicString, 1> families;
+ families.append(m_buttonFontFamily);
+ fontDescription.setFamilies(families);
style->setFontDescription(fontDescription);
style->font().update(styleResolver->fontSelector());
style->setLineHeight(RenderStyle::initialLineHeight());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
