| 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;
|
|
|
| }
|
|
|