Index: Source/core/rendering/RenderObject.cpp |
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp |
index d79cd3f75902c5e8c1d3aae705e877adb5771435..ff6eec93a3eeda5bd5817ab7371deafe366cb7f5 100644 |
--- a/Source/core/rendering/RenderObject.cpp |
+++ b/Source/core/rendering/RenderObject.cpp |
@@ -1857,8 +1857,6 @@ StyleDifference RenderObject::adjustStyleDifference(StyleDifference diff, unsign |
diff = StyleDifferenceLayout; // FIXME: Do this for now since SimplifiedLayout cannot handle updating floating objects lists. |
else if (diff < StyleDifferenceLayoutPositionedMovementOnly) |
diff = StyleDifferenceSimplifiedLayout; |
- else if (diff < StyleDifferenceSimplifiedLayout) |
- diff = StyleDifferenceSimplifiedLayoutAndPositionedMovement; |
} else if (diff < StyleDifferenceRecompositeLayer) |
diff = StyleDifferenceRecompositeLayer; |
} |
@@ -1987,10 +1985,7 @@ void RenderObject::setStyle(PassRefPtr<RenderStyle> style) |
setNeedsLayoutAndPrefWidthsRecalc(); |
else if (updatedDiff == StyleDifferenceLayoutPositionedMovementOnly) |
setNeedsPositionedMovementLayout(); |
- else if (updatedDiff == StyleDifferenceSimplifiedLayoutAndPositionedMovement) { |
- setNeedsPositionedMovementLayout(); |
- setNeedsSimplifiedNormalFlowLayout(); |
- } else if (updatedDiff == StyleDifferenceSimplifiedLayout) |
+ else if (updatedDiff == StyleDifferenceSimplifiedLayout) |
setNeedsSimplifiedNormalFlowLayout(); |
} |
@@ -2139,9 +2134,6 @@ void RenderObject::styleDidChange(StyleDifference diff, const RenderStyle* oldSt |
setNeedsLayoutAndPrefWidthsRecalc(); |
else |
setNeedsSimplifiedNormalFlowLayout(); |
- } else if (diff == StyleDifferenceSimplifiedLayoutAndPositionedMovement) { |
- setNeedsPositionedMovementLayout(); |
- setNeedsSimplifiedNormalFlowLayout(); |
} else if (diff == StyleDifferenceLayoutPositionedMovementOnly) |
setNeedsPositionedMovementLayout(); |