diff options
| author | Ben Murdoch <benm@google.com> | 2011-10-25 08:55:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-25 08:55:54 -0700 |
| commit | 2a9675cb0ba09718f308bc6edff3e2b6a5170383 (patch) | |
| tree | 1592b61d76ff5061f3e1ef3ee9767a87e8fc0a40 /Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp | |
| parent | 5b0ee46e1ba2b63f6601cf65f96a75ba5991d768 (diff) | |
| parent | e82298dad5b93e668a6dae26da91a7d2f942d0bb (diff) | |
| download | external_webkit-2a9675cb0ba09718f308bc6edff3e2b6a5170383.zip external_webkit-2a9675cb0ba09718f308bc6edff3e2b6a5170383.tar.gz external_webkit-2a9675cb0ba09718f308bc6edff3e2b6a5170383.tar.bz2 | |
Merge "Report a load error when network loads blocked."
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp index 56a9539..a6e58c8 100644 --- a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp @@ -110,7 +110,8 @@ WebUrlLoaderClient::WebUrlLoaderClient(WebFrame* webFrame, WebCore::ResourceHand , m_sync(false) , m_finished(false) { - WebResourceRequest webResourceRequest(resourceRequest); + bool block = webFrame->blockNetworkLoads() && (resourceRequest.url().protocolIs("http") || resourceRequest.url().protocolIs("https")); + WebResourceRequest webResourceRequest(resourceRequest, block); UrlInterceptResponse* intercept = webFrame->shouldInterceptRequest(resourceRequest.url().string()); if (intercept) { m_request = new WebRequest(this, webResourceRequest, intercept); |