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

Unified Diff: Source/core/rendering/compositing/CompositedLayerMapping.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix a crashers (everything is building!) Created 5 years, 11 months 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/compositing/CompositedLayerMapping.cpp
diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
index d2001a5dfb27969921c85b632ab4003729352b22..f400a2c100e9501875b4a83bc5de541052651130 100644
--- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp
+++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
@@ -448,7 +448,7 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration()
layerConfigChanged = true;
bool hasPerspective = false;
- if (RenderStyle* style = renderer->style())
+ if (const RenderStyle* style = renderer->style())
hasPerspective = style->hasPerspective();
bool needsChildTransformLayer = hasPerspective && (layerForChildrenTransform() == m_childTransformLayer.get()) && renderer->isBox();
if (updateChildTransformLayer(needsChildTransformLayer))
@@ -1466,7 +1466,7 @@ void CompositedLayerMapping::updateShouldFlattenTransform()
// so that the transform propagates to child layers correctly.
if (GraphicsLayer* childTransformLayer = layerForChildrenTransform()) {
bool hasPerspective = false;
- if (RenderStyle* style = m_owningLayer.renderer()->style())
+ if (const RenderStyle* style = m_owningLayer.renderer()->style())
hasPerspective = style->hasPerspective();
if (hasPerspective)
childTransformLayer->setShouldFlattenTransform(false);
@@ -1893,7 +1893,7 @@ void CompositedLayerMapping::updateImageContents()
FloatPoint3D CompositedLayerMapping::computeTransformOrigin(const IntRect& borderBox) const
{
- RenderStyle* style = renderer()->style();
+ const RenderStyle* style = renderer()->style();
FloatPoint3D origin;
origin.setX(floatValueForLength(style->transformOriginX(), borderBox.width()));

Powered by Google App Engine
This is Rietveld 408576698