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

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

Issue 10375053: Merge 115458 - NULL-deref in RenderBox::clippedOverflowRectForRepaint (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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/inline/crash-new-continuation-with-outline-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/RenderInline.cpp
===================================================================
--- Source/WebCore/rendering/RenderInline.cpp (revision 116440)
+++ Source/WebCore/rendering/RenderInline.cpp (working copy)
@@ -1058,7 +1058,7 @@
}
}
- if (continuation() && !continuation()->isInline()) {
+ if (continuation() && !continuation()->isInline() && continuation()->parent()) {
LayoutRect contRect = continuation()->rectWithOutlineForRepaint(repaintContainer, ow);
r.unite(contRect);
}
« no previous file with comments | « LayoutTests/fast/inline/crash-new-continuation-with-outline-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698