Index: Source/core/rendering/RenderLayerModelObject.cpp |
diff --git a/Source/core/rendering/RenderLayerModelObject.cpp b/Source/core/rendering/RenderLayerModelObject.cpp |
index 6edec16bd01f8d54abaee3bd93bf4541cc58f009..aae53878e6fabc959c8d939dcd9bf5bc178ee454 100644 |
--- a/Source/core/rendering/RenderLayerModelObject.cpp |
+++ b/Source/core/rendering/RenderLayerModelObject.cpp |
@@ -88,22 +88,22 @@ void RenderLayerModelObject::willBeDestroyed() |
destroyLayer(); |
} |
-void RenderLayerModelObject::styleWillChange(StyleDifference diff, const RenderStyle* newStyle) |
+void RenderLayerModelObject::styleWillChange(StyleDifference diff, const RenderStyle& newStyle) |
{ |
s_wasFloating = isFloating(); |
// If our z-index changes value or our visibility changes, |
// we need to dirty our stacking context's z-order list. |
RenderStyle* oldStyle = style(); |
- if (oldStyle && newStyle) { |
+ if (oldStyle) { |
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()) |
+ if (oldStyle->clip() != newStyle.clip()) |
layer()->clipper().clearClipRectsIncludingDescendants(); |
- } else if (diff == StyleDifferenceRepaint || newStyle->outlineSize() < oldStyle->outlineSize()) |
+ } else if (diff == StyleDifferenceRepaint || newStyle.outlineSize() < oldStyle->outlineSize()) |
repaint(); |
} |
@@ -111,20 +111,20 @@ void RenderLayerModelObject::styleWillChange(StyleDifference diff, const RenderS |
// When a layout hint happens, we go ahead and do a repaint of the layer, since the layer could |
// end up being destroyed. |
if (hasLayer()) { |
- if (oldStyle->hasClip() != newStyle->hasClip() |
- || oldStyle->clip() != newStyle->clip()) { |
+ if (oldStyle->hasClip() != newStyle.hasClip() |
+ || oldStyle->clip() != newStyle.clip()) { |
// Composited layers don't need to be repainted when a parent's clip changes. |
layer()->repainter().repaintIncludingNonCompositingDescendants(containerForRepaint()); |
} else if (!layer()->hasCompositedLayerMapping()) { |
- if (oldStyle->position() != newStyle->position() |
- || oldStyle->zIndex() != newStyle->zIndex() |
- || oldStyle->hasAutoZIndex() != newStyle->hasAutoZIndex() |
- || oldStyle->opacity() != newStyle->opacity() |
- || oldStyle->transform() != newStyle->transform() |
- || oldStyle->filter() != newStyle->filter()) |
+ if (oldStyle->position() != newStyle.position() |
+ || oldStyle->zIndex() != newStyle.zIndex() |
+ || oldStyle->hasAutoZIndex() != newStyle.hasAutoZIndex() |
+ || oldStyle->opacity() != newStyle.opacity() |
+ || oldStyle->transform() != newStyle.transform() |
+ || oldStyle->filter() != newStyle.filter()) |
layer()->repainter().repaintIncludingDescendants(); |
} |
- } else if (newStyle->hasTransform() || newStyle->opacity() < 1 || newStyle->hasFilter()) { |
+ } else if (newStyle.hasTransform() || newStyle.opacity() < 1 || newStyle.hasFilter()) { |
// If we don't have a layer yet, but we are going to get one because of transform or opacity, |
// then we need to repaint the old position of the object. |
repaint(); |