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

Unified Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 747493002: Revert "Adding or changing any of box-shadow, outline, or border-image-outset does not need a layou… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 6 years, 1 month 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
Index: Source/core/rendering/style/RenderStyle.cpp
diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp
index 36e663bc0816d672927e5df7451929fefe4d6af0..215ceda870c51b3b2e233f9f62ca3c01678ab08a 100644
--- a/Source/core/rendering/style/RenderStyle.cpp
+++ b/Source/core/rendering/style/RenderStyle.cpp
@@ -474,6 +474,10 @@ bool RenderStyle::diffNeedsFullLayoutAndPaintInvalidation(const RenderStyle& oth
&& *rareNonInheritedData->m_flexibleBox.get() != *other.rareNonInheritedData->m_flexibleBox.get())
return true;
+ // FIXME: We should add an optimized form of layout that just recomputes visual overflow.
+ if (!rareNonInheritedData->shadowDataEquivalent(*other.rareNonInheritedData.get()))
+ return true;
+
if (!rareNonInheritedData->reflectionDataEquivalent(*other.rareNonInheritedData.get()))
return true;
@@ -589,6 +593,11 @@ bool RenderStyle::diffNeedsFullLayoutAndPaintInvalidation(const RenderStyle& oth
if ((visibility() == COLLAPSE) != (other.visibility() == COLLAPSE))
return true;
+ if (!m_background->outline().visuallyEqual(other.m_background->outline())) {
+ // FIXME: We only really need to recompute the overflow but we don't have an optimized layout for it.
+ return true;
+ }
+
// Movement of non-static-positioned object is special cased in RenderStyle::visualInvalidationDiff().
return false;
@@ -652,9 +661,6 @@ bool RenderStyle::diffNeedsPaintInvalidationLayer(const RenderStyle& other) cons
bool RenderStyle::diffNeedsPaintInvalidationObject(const RenderStyle& other) const
{
- if (!m_background->outline().visuallyEqual(other.m_background->outline()))
- return true;
-
if (inherited_flags._visibility != other.inherited_flags._visibility
|| inherited_flags.m_printColorAdjust != other.inherited_flags.m_printColorAdjust
|| inherited_flags._insideLink != other.inherited_flags._insideLink
@@ -673,7 +679,6 @@ bool RenderStyle::diffNeedsPaintInvalidationObject(const RenderStyle& other) con
if (rareNonInheritedData->userDrag != other.rareNonInheritedData->userDrag
|| rareNonInheritedData->m_objectFit != other.rareNonInheritedData->m_objectFit
|| rareNonInheritedData->m_objectPosition != other.rareNonInheritedData->m_objectPosition
- || !rareNonInheritedData->shadowDataEquivalent(*other.rareNonInheritedData.get())
|| !rareNonInheritedData->shapeOutsideDataEquivalent(*other.rareNonInheritedData.get())
|| !rareNonInheritedData->clipPathDataEquivalent(*other.rareNonInheritedData.get()))
return true;
@@ -697,14 +702,8 @@ void RenderStyle::updatePropertySpecificDifferences(const RenderStyle& other, St
if (rareNonInheritedData->m_filter != other.rareNonInheritedData->m_filter)
diff.setFilterChanged();
-
- if (!rareNonInheritedData->shadowDataEquivalent(*other.rareNonInheritedData.get()))
- diff.setVisualOverflowChanged();
}
- if (!m_background->outline().visuallyEqual(other.m_background->outline()) || !surround->border.visualOverflowEqual(other.surround->border))
- diff.setVisualOverflowChanged();
-
if (!diff.needsPaintInvalidation()) {
if (inherited->color != other.inherited->color
|| inherited_flags.m_textUnderline != other.inherited_flags.m_textUnderline

Powered by Google App Engine
This is Rietveld 408576698