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

Unified Diff: Source/core/editing/SimplifyMarkupCommand.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/editing/EditorCommand.cpp ('k') | Source/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/SimplifyMarkupCommand.cpp
diff --git a/Source/core/editing/SimplifyMarkupCommand.cpp b/Source/core/editing/SimplifyMarkupCommand.cpp
index bb22a065128fefa078161b89602a0da72065ac4f..7ba0e0a26b22d730c2cd3a8d5b0c22d479f3c995 100644
--- a/Source/core/editing/SimplifyMarkupCommand.cpp
+++ b/Source/core/editing/SimplifyMarkupCommand.cpp
@@ -26,11 +26,11 @@
#include "config.h"
#include "core/editing/SimplifyMarkupCommand.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
#include "core/dom/NodeTraversal.h"
#include "core/layout/LayoutInline.h"
#include "core/layout/LayoutObject.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
namespace blink {
@@ -55,7 +55,7 @@ void SimplifyMarkupCommand::doApply()
ContainerNode* startingNode = node->parentNode();
if (!startingNode)
continue;
- const LayoutStyle* startingStyle = startingNode->layoutStyle();
+ const ComputedStyle* startingStyle = startingNode->computedStyle();
if (!startingStyle)
continue;
ContainerNode* currentNode = startingNode;
@@ -76,7 +76,7 @@ void SimplifyMarkupCommand::doApply()
break;
}
- if (!currentNode->layoutStyle()->visualInvalidationDiff(*startingStyle).hasDifference())
+ if (!currentNode->computedStyle()->visualInvalidationDiff(*startingStyle).hasDifference())
topNodeWithStartingStyle = currentNode;
}
« no previous file with comments | « Source/core/editing/EditorCommand.cpp ('k') | Source/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698