Remove duplicated invalidation

Remove duplicated invalidation

The code to generate an invalidation for StyleDifferenceRepaint and outline
decrease in RenderLayerModelObject::styleWillChange is duplicated with the
one in RenderObject::styleWillChange. This meant that we would generate 2
identical invalidations for each repaint-cue or outline decrease.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=170591

[eseidel, 2014-03-31 17:11:31]

lgtm

Looks like we have a 3rd copy in there somewhere too. :)

[commit-bot: I haz the power, 2014-03-31 17:11:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jchaffraix@chromium.org/217973002/20001

[esprehn, 2014-03-31 17:19:45]

The CQ bit was unchecked by esprehn@chromium.org

[esprehn, 2014-03-31 17:19:49]

https://codereview.chromium.org/217973002/diff/20001/Source/core/rendering/Re...
File Source/core/rendering/RenderLayerModelObject.cpp (right):

https://codereview.chromium.org/217973002/diff/20001/Source/core/rendering/Re...
Source/core/rendering/RenderLayerModelObject.cpp:100: // having an outline to
not having an outline.
This comment is now stale. Please remove it.

[Julien - ping for review, 2014-03-31 18:04:03]

> Looks like we have a 3rd copy in there somewhere too. :)

I think the 2 invalidations are expected in the current code: one before style
change (with the old style) and one after style change, even if we end up not
changing size.

https://codereview.chromium.org/217973002/diff/20001/Source/core/rendering/Re...
File Source/core/rendering/RenderLayerModelObject.cpp (right):

https://codereview.chromium.org/217973002/diff/20001/Source/core/rendering/Re...
Source/core/rendering/RenderLayerModelObject.cpp:100: // having an outline to
not having an outline.
On 2014/03/31 17:19:50, esprehn wrote:
> This comment is now stale. Please remove it.

We still generate an invalidation with the old style through
RenderLayerRepainter so I don't think we should remove it. I will amend it to
refer to the logic in RenderObject::styleWillChange.

[Julien - ping for review, 2014-03-31 18:19:10]

The CQ bit was checked by jchaffraix@chromium.org

[commit-bot: I haz the power, 2014-03-31 18:19:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jchaffraix@chromium.org/217973002/40001

[commit-bot: I haz the power, 2014-03-31 19:00:32]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-31 19:00:32]

Try jobs failed on following builders:
  tryserver.blink on mac_blink_rel

[Julien - ping for review, 2014-03-31 19:46:28]

The CQ bit was checked by jchaffraix@chromium.org

[commit-bot: I haz the power, 2014-03-31 19:46:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jchaffraix@chromium.org/217973002/60001

[commit-bot: I haz the power, 2014-03-31 20:16:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-31 20:16:53]

Try jobs failed on following builders:
  tryserver.blink on linux_blink_rel

[esprehn, 2014-03-31 20:19:44]

The CQ bit was checked by esprehn@chromium.org

[commit-bot: I haz the power, 2014-03-31 20:19:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jchaffraix@chromium.org/217973002/60001

[commit-bot: I haz the power, 2014-03-31 23:50:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-31 23:50:41]

Failed to apply patch for Source/core/rendering/RenderLayerModelObject.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/rendering/RenderLayerModelObject.cpp
  Hunk #1 FAILED at 96.
  1 out of 1 hunk FAILED -- saving rejects to file
Source/core/rendering/RenderLayerModelObject.cpp.rej

Patch:       Source/core/rendering/RenderLayerModelObject.cpp
Index: Source/core/rendering/RenderLayerModelObject.cpp
diff --git a/Source/core/rendering/RenderLayerModelObject.cpp
b/Source/core/rendering/RenderLayerModelObject.cpp
index
6edec16bd01f8d54abaee3bd93bf4541cc58f009..cfee927ba019e1d608ee8964e643288bb18cd5a2
100644
--- a/Source/core/rendering/RenderLayerModelObject.cpp
+++ b/Source/core/rendering/RenderLayerModelObject.cpp
@@ -96,15 +96,12 @@ void RenderLayerModelObject::styleWillChange(StyleDifference
diff, const RenderS
     // we need to dirty our stacking context's z-order list.
     RenderStyle* oldStyle = style();
     if (oldStyle && newStyle) {
-        if (parent()) {
-            // Do a repaint with the old style first, e.g., for example if we
go from
-            // having an outline to not having an outline.
-            if (diff == StyleDifferenceRepaintLayer) {
-                layer()->repainter().repaintIncludingDescendants();
-                if (oldStyle->clip() != newStyle->clip())
-                    layer()->clipper().clearClipRectsIncludingDescendants();
-            } else if (diff == StyleDifferenceRepaint ||
newStyle->outlineSize() < oldStyle->outlineSize())
-                repaint();
+        // Do a repaint with the old style first through RenderLayerRepainter.
+        // RenderObject::styleWillChange takes care of repainting objects
without RenderLayers.
+        if (parent() && diff == StyleDifferenceRepaintLayer) {
+            layer()->repainter().repaintIncludingDescendants();
+            if (oldStyle->clip() != newStyle->clip())
+                layer()->clipper().clearClipRectsIncludingDescendants();
         }
 
         if (diff == StyleDifferenceLayout || diff ==
StyleDifferenceSimplifiedLayout) {

[Julien - ping for review, 2014-04-01 01:09:05]

The CQ bit was checked by jchaffraix@chromium.org

[commit-bot: I haz the power, 2014-04-01 01:09:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jchaffraix@chromium.org/217973002/80001

[commit-bot: I haz the power, 2014-04-01 01:30:21]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-01 01:30:24]

Try jobs failed on following builders:
  tryserver.blink on win_blink_compile_dbg

[Julien - ping for review, 2014-04-01 17:13:12]

The CQ bit was checked by jchaffraix@chromium.org

[commit-bot: I haz the power, 2014-04-01 17:13:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jchaffraix@chromium.org/217973002/80001

[commit-bot: I haz the power, 2014-04-01 18:22:32]

Change committed as 170591