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

Unified Diff: third_party/WebKit/WebCore/rendering/RenderWidget.cpp

Issue 21152: WebKit merge 40668:40722 part 1. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | « third_party/WebKit/WebCore/rendering/RenderView.cpp ('k') | third_party/WebKit/WebCore/rendering/bidi.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/WebCore/rendering/RenderWidget.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderWidget.cpp (revision 9310)
+++ third_party/WebKit/WebCore/rendering/RenderWidget.cpp (working copy)
@@ -91,20 +91,20 @@
if (hasOverrideSize())
setOverrideSize(-1);
- RenderLayer* layer = m_layer;
RenderArena* arena = renderArena();
- if (layer)
- layer->clearClipRects();
+ if (hasLayer())
+ layer()->clearClipRects();
if (style() && (style()->height().isPercent() || style()->minHeight().isPercent() || style()->maxHeight().isPercent()))
RenderBlock::removePercentHeightDescendant(this);
setNode(0);
+
+ if (hasLayer())
+ layer()->destroy(arena);
+
deref(arena);
-
- if (layer)
- layer->destroy(arena);
}
RenderWidget::~RenderWidget()
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderView.cpp ('k') | third_party/WebKit/WebCore/rendering/bidi.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698