summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorsgurun@chromium.org <sgurun@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-23 21:38:41 +0000
committersgurun@chromium.org <sgurun@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-23 21:38:41 +0000
commit4c8231465357de882a36bd4c6e5007d74ddf0f47 (patch)
tree681affc725569cde2d03eee47f7483a5cbf94ffd /android_webview
parent6e70b1981e49fc49ec51e9b82987cf4d692e4b8a (diff)
downloadchromium_src-4c8231465357de882a36bd4c6e5007d74ddf0f47.zip
chromium_src-4c8231465357de882a36bd4c6e5007d74ddf0f47.tar.gz
chromium_src-4c8231465357de882a36bd4c6e5007d74ddf0f47.tar.bz2
Do not block/defer requests that are internally generated.
BUG=277245 We unintentionally defer/block requests that are internally generated since these do not have a renderview process/view associated with them. Fix this. Review URL: https://chromiumcodereview.appspot.com/22866019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index 8973777..49d98da 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -94,6 +94,13 @@ IoThreadClientThrottle::~IoThreadClientThrottle() {
}
void IoThreadClientThrottle::WillStartRequest(bool* defer) {
+ // TODO(sgurun): This block can be removed when crbug.com/277937 is fixed.
+ if (route_id_ < 1) {
+ // OPTIONS is used for preflighted requests which are generated internally.
+ DCHECK_EQ("OPTIONS", request_->method());
+ return;
+ }
+ DCHECK(child_id_);
if (!MaybeDeferRequest(defer)) {
MaybeBlockRequest();
}