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

Unified Diff: Source/core/css/SelectorChecker.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 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/core/css/SelectorChecker.h ('k') | Source/core/css/SiblingTraversalStrategies.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/SelectorChecker.cpp
diff --git a/Source/core/css/SelectorChecker.cpp b/Source/core/css/SelectorChecker.cpp
index 54b9b058e23aca54cb8bcc436549e923bd71c92e..66b76bade8e6ac1f944cd1199daeb5c9a41f6966 100644
--- a/Source/core/css/SelectorChecker.cpp
+++ b/Source/core/css/SelectorChecker.cpp
@@ -34,7 +34,7 @@
#include "core/dom/Document.h"
#include "core/dom/ElementTraversal.h"
#include "core/dom/Fullscreen.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
#include "core/dom/StyleEngine.h"
#include "core/dom/Text.h"
#include "core/dom/shadow/InsertionPoint.h"
@@ -51,7 +51,7 @@
#include "core/inspector/InspectorInstrumentation.h"
#include "core/layout/LayoutObject.h"
#include "core/layout/LayoutScrollbar.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
#include "core/page/FocusController.h"
#include "core/page/Page.h"
#include "platform/scroll/ScrollableArea.h"
@@ -625,8 +625,8 @@ bool SelectorChecker::checkPseudoClass(const SelectorCheckingContext& context, c
element.setStyleAffectedByEmpty();
if (context.elementStyle)
context.elementStyle->setEmptyState(result);
- else if (element.layoutStyle() && (element.document().styleEngine().usesSiblingRules() || element.layoutStyle()->unique()))
- element.mutableLayoutStyle()->setEmptyState(result);
+ else if (element.computedStyle() && (element.document().styleEngine().usesSiblingRules() || element.computedStyle()->unique()))
+ element.mutableComputedStyle()->setEmptyState(result);
}
return result;
}
@@ -702,7 +702,7 @@ bool SelectorChecker::checkPseudoClass(const SelectorCheckingContext& context, c
if (ContainerNode* parent = element.parentElementOrDocumentFragment()) {
int count = 1 + siblingTraversalStrategy.countElementsBefore(element);
if (m_mode == ResolvingStyle) {
- LayoutStyle* childStyle = context.elementStyle ? context.elementStyle : element.mutableLayoutStyle();
+ ComputedStyle* childStyle = context.elementStyle ? context.elementStyle : element.mutableComputedStyle();
if (childStyle)
childStyle->setUnique();
parent->setChildrenAffectedByForwardPositionalRules();
« no previous file with comments | « Source/core/css/SelectorChecker.h ('k') | Source/core/css/SiblingTraversalStrategies.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698