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

Unified Diff: Source/WebCore/rendering/RenderObjectChildList.cpp

Issue 7703003: Merge 93382 - REGRESSION(r90971): Null pointer dereference with placeholder and webkit-scrollbar-... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 4 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 | « LayoutTests/fast/forms/placeholder-crash-with-scrollbar-corner-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderObjectChildList.cpp
===================================================================
--- Source/WebCore/rendering/RenderObjectChildList.cpp (revision 93488)
+++ Source/WebCore/rendering/RenderObjectChildList.cpp (working copy)
@@ -84,8 +84,8 @@
// if we remove visible child from an invisible parent, we don't know the layer visibility any more
RenderLayer* layer = 0;
if (owner->style()->visibility() != VISIBLE && oldChild->style()->visibility() == VISIBLE && !oldChild->hasLayer()) {
- layer = owner->enclosingLayer();
- layer->dirtyVisibleContentStatus();
+ if ((layer = owner->enclosingLayer()))
+ layer->dirtyVisibleContentStatus();
}
// Keep our layer hierarchy updated.
« no previous file with comments | « LayoutTests/fast/forms/placeholder-crash-with-scrollbar-corner-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698