diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/rendering/RenderScrollbarPart.cpp | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/rendering/RenderScrollbarPart.cpp')
| -rw-r--r-- | WebCore/rendering/RenderScrollbarPart.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderScrollbarPart.cpp b/WebCore/rendering/RenderScrollbarPart.cpp index d2f1612..ea61e24 100644 --- a/WebCore/rendering/RenderScrollbarPart.cpp +++ b/WebCore/rendering/RenderScrollbarPart.cpp @@ -86,6 +86,8 @@ static int calcScrollbarThicknessUsing(const Length& l, int containingLength) void RenderScrollbarPart::computeScrollbarWidth() { + if (!m_scrollbar->owningRenderer()) + return; int visibleSize = m_scrollbar->owningRenderer()->width() - m_scrollbar->owningRenderer()->borderLeft() - m_scrollbar->owningRenderer()->borderRight(); int w = calcScrollbarThicknessUsing(style()->width(), visibleSize); int minWidth = calcScrollbarThicknessUsing(style()->minWidth(), visibleSize); @@ -99,6 +101,8 @@ void RenderScrollbarPart::computeScrollbarWidth() void RenderScrollbarPart::computeScrollbarHeight() { + if (!m_scrollbar->owningRenderer()) + return; int visibleSize = m_scrollbar->owningRenderer()->height() - m_scrollbar->owningRenderer()->borderTop() - m_scrollbar->owningRenderer()->borderBottom(); int h = calcScrollbarThicknessUsing(style()->height(), visibleSize); int minHeight = calcScrollbarThicknessUsing(style()->minHeight(), visibleSize); |