| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #include "webkit/glue/plugins/plugin_instance.h" | 7 #include "webkit/glue/plugins/plugin_instance.h" |
| 8 | 8 |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 | 53 |
| 54 if (npp_ != 0) { | 54 if (npp_ != 0) { |
| 55 delete npp_; | 55 delete npp_; |
| 56 npp_ = 0; | 56 npp_ = 0; |
| 57 } | 57 } |
| 58 | 58 |
| 59 if (plugin_) | 59 if (plugin_) |
| 60 plugin_->CloseInstance(); | 60 plugin_->CloseInstance(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 PluginStreamUrl* PluginInstance::CreateStream(int resource_id, | 63 PluginStreamUrl* PluginInstance::CreateStream(unsigned long resource_id, |
| 64 const GURL& url, | 64 const GURL& url, |
| 65 const std::string& mime_type, | 65 const std::string& mime_type, |
| 66 bool notify_needed, | 66 bool notify_needed, |
| 67 void* notify_data) { | 67 void* notify_data) { |
| 68 PluginStreamUrl* stream = new PluginStreamUrl( | 68 PluginStreamUrl* stream = new PluginStreamUrl( |
| 69 resource_id, url, this, notify_needed, notify_data); | 69 resource_id, url, this, notify_needed, notify_data); |
| 70 | 70 |
| 71 AddStream(stream); | 71 AddStream(stream); |
| 72 return stream; | 72 return stream; |
| 73 } | 73 } |
| (...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 stream->url, range_info.c_str(), | 483 stream->url, range_info.c_str(), |
| 484 reinterpret_cast<intptr_t>(plugin_stream), | 484 reinterpret_cast<intptr_t>(plugin_stream), |
| 485 plugin_stream->notify_needed(), | 485 plugin_stream->notify_needed(), |
| 486 reinterpret_cast<intptr_t>(plugin_stream->notify_data())); | 486 reinterpret_cast<intptr_t>(plugin_stream->notify_data())); |
| 487 break; | 487 break; |
| 488 } | 488 } |
| 489 } | 489 } |
| 490 } | 490 } |
| 491 | 491 |
| 492 } // namespace NPAPI | 492 } // namespace NPAPI |
| OLD | NEW |