diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-30 22:36:04 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-30 22:36:04 +0000 |
| commit | 8388adaf8d1ae2d3793c18bb878daadd91f408c7 (patch) | |
| tree | 710d6d37b0277bb197a030701ab79309b68cd835 /chrome/plugin | |
| parent | de0c4e4f741ee8076e2081564790dbf778eaa7b5 (diff) | |
| download | chromium_src-8388adaf8d1ae2d3793c18bb878daadd91f408c7.zip chromium_src-8388adaf8d1ae2d3793c18bb878daadd91f408c7.tar.gz chromium_src-8388adaf8d1ae2d3793c18bb878daadd91f408c7.tar.bz2 | |
Reverting 22041 as it caused plugin crashes in reliability test runs.
Also reverting 22065/22046/22041 which are changes to knowncrashes.txt.
TBR=huanr
Review URL: http://codereview.chromium.org/160418
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/webplugin_delegate_stub.cc | 6 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_delegate_stub.h | 3 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_proxy.cc | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc index c42815a..277ff91 100644 --- a/chrome/plugin/webplugin_delegate_stub.cc +++ b/chrome/plugin/webplugin_delegate_stub.cc @@ -175,7 +175,8 @@ void WebPluginDelegateStub::OnWillSendRequest(int id, const GURL& url) { } void WebPluginDelegateStub::OnDidReceiveResponse( - const PluginMsg_DidReceiveResponseParams& params) { + const PluginMsg_DidReceiveResponseParams& params, bool* cancel) { + *cancel = false; WebPluginResourceClient* client = webplugin_->GetResourceClient(params.id); if (!client) return; @@ -184,7 +185,8 @@ void WebPluginDelegateStub::OnDidReceiveResponse( params.headers, params.expected_length, params.last_modified, - params.request_is_seekable); + params.request_is_seekable, + cancel); } void WebPluginDelegateStub::OnDidReceiveData(int id, diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h index 519a648..2def46c 100644 --- a/chrome/plugin/webplugin_delegate_stub.h +++ b/chrome/plugin/webplugin_delegate_stub.h @@ -52,7 +52,8 @@ class WebPluginDelegateStub : public IPC::Channel::Listener, void OnInit(const PluginMsg_Init_Params& params, bool* result); void OnWillSendRequest(int id, const GURL& url); - void OnDidReceiveResponse(const PluginMsg_DidReceiveResponseParams& params); + void OnDidReceiveResponse(const PluginMsg_DidReceiveResponseParams& params, + bool* cancel); void OnDidReceiveData(int id, const std::vector<char>& buffer, int data_offset); void OnDidFinishLoading(int id); diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index 5483956..fc061ce 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -287,10 +287,8 @@ WebPluginProxy* WebPluginProxy::FromCPBrowsingContext( WebPluginResourceClient* WebPluginProxy::GetResourceClient(int id) { ResourceClientMap::iterator iterator = resource_clients_.find(id); - // The IPC messages which deal with streams are now asynchronous. It is - // now possible to receive stream messages from the renderer for streams - // which may have been cancelled by the plugin. if (iterator == resource_clients_.end()) { + NOTREACHED(); return NULL; } |