summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 23:31:41 +0000
committerpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 23:31:41 +0000
commitcef99efc12e7fabf12ebfbc0c67fa8322eee8351 (patch)
tree4837ade5ea87d734ea8ed12b53b58a4cb976875d /webkit
parentebbad604e6a6022369ac470172dcccb0dffdce9a (diff)
downloadchromium_src-cef99efc12e7fabf12ebfbc0c67fa8322eee8351.zip
chromium_src-cef99efc12e7fabf12ebfbc0c67fa8322eee8351.tar.gz
chromium_src-cef99efc12e7fabf12ebfbc0c67fa8322eee8351.tar.bz2
Comment out broken CHECK in ppapi/ppb_url_loader_impl.cc.
BUG=70347 TESTED=bots + used nacl with ppapi_geturl that uncovered the crash Review URL: http://codereview.chromium.org/6338014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppb_url_loader_impl.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.cc b/webkit/plugins/ppapi/ppb_url_loader_impl.cc
index d885545..7920cca 100644
--- a/webkit/plugins/ppapi/ppb_url_loader_impl.cc
+++ b/webkit/plugins/ppapi/ppb_url_loader_impl.cc
@@ -467,7 +467,9 @@ void PPB_URLLoader_Impl::RegisterCallback(PP_CompletionCallback callback) {
void PPB_URLLoader_Impl::RunCallback(int32_t result) {
// This may be null only when this is a main document loader.
if (!pending_callback_.get()) {
- CHECK(main_document_loader_);
+ // TODO(viettrungluu): put this CHECK back when the callback race condition
+ // is fixed: http://code.google.com/p/chromium/issues/detail?id=70347.
+ //CHECK(main_document_loader_);
return;
}
@@ -541,4 +543,3 @@ bool PPB_URLLoader_Impl::RecordUploadProgress() const {
} // namespace ppapi
} // namespace webkit
-