Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: Source/WebCore/css/CSSStyleSelector.cpp

Issue 8390051: Merge 98492 - REGRESSION (r94887): Scrolling the HTML spec is more jerky now than it was (regress... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/css/adjacent-sibling-selector-expected.txt ('k') | Source/WebCore/css/SelectorChecker.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/css/CSSStyleSelector.cpp
===================================================================
--- Source/WebCore/css/CSSStyleSelector.cpp (revision 98492)
+++ Source/WebCore/css/CSSStyleSelector.cpp (working copy)
@@ -889,9 +889,6 @@
if (style->transitions() || style->animations())
return false;
- if (style->affectedByDirectAdjacentRules())
- return false;
-
#if USE(ACCELERATED_COMPOSITING)
// Turn off style sharing for elements that can gain layers for reasons outside of the style system.
// See comments in RenderObject::setStyle().
@@ -931,7 +928,8 @@
{
return parentStyle->childrenAffectedByPositionalRules()
|| parentStyle->childrenAffectedByFirstChildRules()
- || parentStyle->childrenAffectedByLastChildRules();
+ || parentStyle->childrenAffectedByLastChildRules()
+ || parentStyle->childrenAffectedByDirectAdjacentRules();
}
RenderStyle* CSSStyleSelector::locateSharedStyle()
« no previous file with comments | « LayoutTests/fast/css/adjacent-sibling-selector-expected.txt ('k') | Source/WebCore/css/SelectorChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698