summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-02-14 07:36:39 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-14 07:36:39 -0800
commitd3578c52328364ca99012a1de1a8dba8cccd83db (patch)
tree400451a90f6cbeae79c8120338ebb4448d577681 /WebKit/android/WebCoreSupport
parente5c90f700f64667817813fbb2e8478ddb7a6927b (diff)
parent0d89cb8caf679598f535cac95c90eb8cda4c4f44 (diff)
downloadexternal_webkit-d3578c52328364ca99012a1de1a8dba8cccd83db.zip
external_webkit-d3578c52328364ca99012a1de1a8dba8cccd83db.tar.gz
external_webkit-d3578c52328364ca99012a1de1a8dba8cccd83db.tar.bz2
Merge "Partly fix for bug 3410366"
Diffstat (limited to 'WebKit/android/WebCoreSupport')
-rw-r--r--WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
index 636f7be..642a81a 100644
--- a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
+++ b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
@@ -87,6 +87,8 @@ bool WebUrlLoaderClient::isActive() const
{
if (m_cancelling)
return false;
+ if (!m_resourceHandle)
+ return false;
if (!m_resourceHandle->client())
return false;
if (m_finished)