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

Unified Diff: Source/WebCore/css/SelectorChecker.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 | « Source/WebCore/css/CSSStyleSelector.cpp ('k') | Source/WebCore/dom/Element.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/css/SelectorChecker.cpp
===================================================================
--- Source/WebCore/css/SelectorChecker.cpp (revision 98492)
+++ Source/WebCore/css/SelectorChecker.cpp (working copy)
@@ -483,10 +483,10 @@
}
case CSSSelector::DirectAdjacent:
{
- if (!m_isCollectingRulesOnly) {
- RenderStyle* currentStyle = elementStyle ? elementStyle : e->renderStyle();
- if (currentStyle)
- currentStyle->setAffectedByDirectAdjacentRules();
+ if (!m_isCollectingRulesOnly && e->parentNode() && e->parentNode()->isElementNode()) {
+ RenderStyle* parentStyle = elementStyle ? elementParentStyle : e->parentNode()->renderStyle();
+ if (parentStyle)
+ parentStyle->setChildrenAffectedByDirectAdjacentRules();
}
Node* n = e->previousSibling();
while (n && !n->isElementNode())
« no previous file with comments | « Source/WebCore/css/CSSStyleSelector.cpp ('k') | Source/WebCore/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698