diff options
| author | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 17:09:41 +0000 |
|---|---|---|
| committer | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 17:09:41 +0000 |
| commit | 54b664763fe6ded98a0c03f8579a953517bc69b1 (patch) | |
| tree | 5fdaf58153a253a8d314f50aca078d483c5ad611 /webkit | |
| parent | 39498f5afc47c0f312248620e1ba93b72af47d2c (diff) | |
| download | chromium_src-54b664763fe6ded98a0c03f8579a953517bc69b1.zip chromium_src-54b664763fe6ded98a0c03f8579a953517bc69b1.tar.gz chromium_src-54b664763fe6ded98a0c03f8579a953517bc69b1.tar.bz2 | |
Fix layout test insecure-script-in-iframe.html Original patch by Ilya Tikhonovsky: http://codereview.chromium.org/500098
BUG=30653
Review URL: http://codereview.chromium.org/500100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webplugin_impl.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index a3148b1..2cc4962 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -734,6 +734,13 @@ void WebPluginImpl::didReceiveData(WebURLLoader* loader, WebPluginResourceClient* client = GetClientFromLoader(loader); if (!client) return; + + // ClientInfo can be removed from clients_ vector by next statements. + if (WebDevToolsAgent* devtools_agent = GetDevToolsAgent()) { + ClientInfo* client_info = GetClientInfoFromLoader(loader); + if (client_info) + devtools_agent->didReceiveData(client_info->id, length); + } MultiPartResponseHandlerMap::iterator index = multi_part_response_map_.find(client); if (index != multi_part_response_map_.end()) { @@ -744,12 +751,6 @@ void WebPluginImpl::didReceiveData(WebURLLoader* loader, loader->setDefersLoading(true); client->DidReceiveData(buffer, length, 0); } - - if (WebDevToolsAgent* devtools_agent = GetDevToolsAgent()) { - ClientInfo* client_info = GetClientInfoFromLoader(loader); - if (client_info) - devtools_agent->didReceiveData(client_info->id, length); - } } void WebPluginImpl::didFinishLoading(WebURLLoader* loader) { |