summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwkorman <wkorman@chromium.org>2016-03-25 18:04:00 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-26 01:04:58 +0000
commiteb6813df8a49dbe1e9afa3994f1347ec6329340f (patch)
treed768ce8efc5f2b8c935090c41eaff1553f0d35d0
parente4a406a55b1fb94080258f5801338ff63b8dcbed (diff)
downloadchromium_src-eb6813df8a49dbe1e9afa3994f1347ec6329340f.zip
chromium_src-eb6813df8a49dbe1e9afa3994f1347ec6329340f.tar.gz
chromium_src-eb6813df8a49dbe1e9afa3994f1347ec6329340f.tar.bz2
Make sure we have a scrollable area before delegating visual rect call.
BUG=598016 Review URL: https://codereview.chromium.org/1833313002 Cr-Commit-Position: refs/heads/master@{#383427}
-rw-r--r--third_party/WebKit/Source/platform/scroll/Scrollbar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
index 0c539b9..420833e 100644
--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
@@ -611,7 +611,7 @@ float Scrollbar::scrollableAreaTargetPos() const
LayoutRect Scrollbar::visualRect() const
{
- return getScrollableArea()->visualRectForScrollbarParts();
+ return m_scrollableArea ? m_scrollableArea->visualRectForScrollbarParts() : LayoutRect();
}
void Scrollbar::setNeedsPaintInvalidation(ScrollbarPart invalidParts)