Title: [94830] branches/chromium/874/Source/WebCore/rendering/RenderScrollbar.cpp
- Revision
- 94830
- Author
- infe...@chromium.org
- Date
- 2011-09-08 20:19:44 -0700 (Thu, 08 Sep 2011)
Log Message
Merge 94690 - Null owningRenderer crash in RenderScrollbar::updateScrollbarParts.
BUG=95552
Review URL: http://codereview.chromium.org/7787021
Modified Paths
Diff
Modified: branches/chromium/874/Source/WebCore/rendering/RenderScrollbar.cpp (94829 => 94830)
--- branches/chromium/874/Source/WebCore/rendering/RenderScrollbar.cpp 2011-09-09 02:57:39 UTC (rev 94829)
+++ branches/chromium/874/Source/WebCore/rendering/RenderScrollbar.cpp 2011-09-09 03:19:44 UTC (rev 94830)
@@ -195,7 +195,8 @@
if (newThickness != oldThickness) {
setFrameRect(IntRect(x(), y(), isHorizontal ? width() : newThickness, isHorizontal ? newThickness : height()));
- owningRenderer()->setChildNeedsLayout(true);
+ if (RenderBox* box = owningRenderer())
+ box->setChildNeedsLayout(true);
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
