| Index: webkit/glue/plugins/plugin_instance.cc
|
| ===================================================================
|
| --- webkit/glue/plugins/plugin_instance.cc (revision 23177)
|
| +++ webkit/glue/plugins/plugin_instance.cc (working copy)
|
| @@ -375,12 +375,10 @@
|
| response_url = instance_url_.spec();
|
| }
|
|
|
| - bool cancel = false;
|
| -
|
| plugin_data_stream_ = CreateStream(-1, url, mime_type, false, NULL);
|
|
|
| plugin_data_stream_->DidReceiveResponse(mime_type, headers, expected_length,
|
| - last_modified, true, &cancel);
|
| + last_modified, true);
|
| }
|
|
|
| void PluginInstance::DidReceiveManualData(const char* buffer, int length) {
|
|
|
| Property changes on: webkit\glue\plugins\plugin_instance.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/plugins/plugin_instance.cc:r3734-4217,4606-5108,5177-5263
|
| Merged /trunk/src/webkit/glue/plugins/plugin_instance.cc:r22369
|
|
|
|
|