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

Unified Diff: sky/engine/core/rendering/RenderBox.cpp

Issue 969893002: Make removing a transform not crash. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | sky/tests/styles/transforms.sky » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBox.cpp
diff --git a/sky/engine/core/rendering/RenderBox.cpp b/sky/engine/core/rendering/RenderBox.cpp
index a1af5ab2a92c706423e971809046112a983411c4..6e19b2e64b80f5ba8c44aa9e7377ad03e6931ed5 100644
--- a/sky/engine/core/rendering/RenderBox.cpp
+++ b/sky/engine/core/rendering/RenderBox.cpp
@@ -184,14 +184,15 @@ void RenderBox::updateTransform(const RenderStyle* oldStyle)
m_transform.clear();
// Layers with transforms act as clip rects roots, so clear the cached clip rects here.
- layer()->clipper().clearClipRectsIncludingDescendants();
- } else if (localHasTransform) {
+ if (layer())
+ layer()->clipper().clearClipRectsIncludingDescendants();
+ } else if (localHasTransform && layer()) {
layer()->clipper().clearClipRectsIncludingDescendants(AbsoluteClipRects);
}
updateTransformationMatrix();
- if (had3DTransform != has3DTransform())
+ if (layer() && had3DTransform != has3DTransform())
layer()->dirty3DTransformedDescendantStatus();
}
« no previous file with comments | « no previous file | sky/tests/styles/transforms.sky » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698