Title: [98826] trunk/Source/WebCore
- Revision
- 98826
- Author
- [email protected]
- Date
- 2011-10-30 09:03:52 -0700 (Sun, 30 Oct 2011)
Log Message
Unreviewed, rolling out r98803.
http://trac.webkit.org/changeset/98803
https://bugs.webkit.org/show_bug.cgi?id=71186
Causing test and assertion failures on some platforms
(Requested by anttik on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-10-30
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyMatchedDeclarations):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98825 => 98826)
--- trunk/Source/WebCore/ChangeLog 2011-10-30 07:57:04 UTC (rev 98825)
+++ trunk/Source/WebCore/ChangeLog 2011-10-30 16:03:52 UTC (rev 98826)
@@ -1,3 +1,15 @@
+2011-10-30 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98803.
+ http://trac.webkit.org/changeset/98803
+ https://bugs.webkit.org/show_bug.cgi?id=71186
+
+ Causing test and assertion failures on some platforms
+ (Requested by anttik on #webkit).
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyMatchedDeclarations):
+
2011-10-29 Mark Rowe <[email protected]>
Build fix.
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (98825 => 98826)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-10-30 07:57:04 UTC (rev 98825)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-10-30 16:03:52 UTC (rev 98826)
@@ -2234,17 +2234,6 @@
return true;
}
-static bool fontDifferenceAffectsNonInherited(const RenderStyle* style, const RenderStyle* cachedStyle)
-{
- if (style->fontMetrics().xHeight() != cachedStyle->fontMetrics().xHeight())
- return true;
- if (style->fontDescription().computedSize() != cachedStyle->fontDescription().computedSize())
- return true;
- if (style->fontDescription().orientation() != cachedStyle->fontDescription().orientation())
- return true;
- return false;
-}
-
void CSSStyleSelector::applyMatchedDeclarations(const MatchResult& matchResult)
{
unsigned cacheHash = matchResult.isCacheable ? computeDeclarationHash(m_matchedDecls.data(), m_matchedDecls.size()) : 0;
@@ -2279,8 +2268,8 @@
if (m_lineHeightValue)
applyProperty(CSSPropertyLineHeight, m_lineHeightValue);
- // Many properties depend on the font size. If it changes we just apply all properties.
- if (cachedStyle && fontDifferenceAffectsNonInherited(m_style.get(), cachedStyle))
+ // Many properties depend on the font. If it changes we just apply all properties.
+ if (cachedStyle && cachedStyle->fontDescription() != m_style->fontDescription())
applyInheritedOnly = false;
// Now do the normal priority UA properties.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
