diff options
| author | Ben Murdoch <benm@google.com> | 2011-08-26 11:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-08-26 11:35:50 +0100 |
| commit | ec7cadd6477635dceb9ef29175fbb0bc55659462 (patch) | |
| tree | 5e564d69805baeed7301ab67bb125d4d1990b84c /Source | |
| parent | 6a38539ec9262d5ba7b98c2a78df3866faa7c45d (diff) | |
| download | external_webkit-ec7cadd6477635dceb9ef29175fbb0bc55659462.zip external_webkit-ec7cadd6477635dceb9ef29175fbb0bc55659462.tar.gz external_webkit-ec7cadd6477635dceb9ef29175fbb0bc55659462.tar.bz2 | |
Fix crash when scrolling non-HW accelerated WebView
Need to null check m_glWebViewState. It should also have
a compile time guard.
Bug: 5219373
Change-Id: I36fc559fd20e54dc34912f7843a9aa6d2316765b
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 577b7c6..945a785 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1332,7 +1332,10 @@ bool scrollBy(int dx, int dy) void setIsScrolling(bool isScrolling) { - m_glWebViewState->setIsScrolling(isScrolling); +#if USE(ACCELERATED_COMPOSITING) + if (m_glWebViewState) + m_glWebViewState->setIsScrolling(isScrolling); +#endif } bool hasCursorNode() |