OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/plugins/npapi/plugin_instance.h" | 5 #include "webkit/plugins/npapi/plugin_instance.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
11 #include "base/string_number_conversions.h" | 11 #include "base/string_number_conversions.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "net/base/escape.h" |
13 #include "webkit/glue/webkit_glue.h" | 14 #include "webkit/glue/webkit_glue.h" |
14 #include "webkit/plugins/npapi/plugin_host.h" | 15 #include "webkit/plugins/npapi/plugin_host.h" |
15 #include "webkit/plugins/npapi/plugin_lib.h" | 16 #include "webkit/plugins/npapi/plugin_lib.h" |
16 #include "webkit/plugins/npapi/plugin_stream_url.h" | 17 #include "webkit/plugins/npapi/plugin_stream_url.h" |
17 #include "webkit/plugins/npapi/plugin_string_stream.h" | 18 #include "webkit/plugins/npapi/plugin_string_stream.h" |
18 #include "webkit/plugins/npapi/webplugin.h" | 19 #include "webkit/plugins/npapi/webplugin.h" |
19 #include "webkit/plugins/npapi/webplugin_delegate.h" | 20 #include "webkit/plugins/npapi/webplugin_delegate.h" |
20 #include "net/base/escape.h" | 21 #include "webkit/plugins/plugin_constants.h" |
21 | 22 |
22 #if defined(OS_MACOSX) | 23 #if defined(OS_MACOSX) |
23 #include <ApplicationServices/ApplicationServices.h> | 24 #include <ApplicationServices/ApplicationServices.h> |
24 #endif | 25 #endif |
25 | 26 |
26 namespace webkit { | 27 namespace webkit { |
27 namespace npapi { | 28 namespace npapi { |
28 | 29 |
29 PluginInstance::PluginInstance(PluginLib *plugin, const std::string &mime_type) | 30 PluginInstance::PluginInstance(PluginLib *plugin, const std::string &mime_type) |
30 : plugin_(plugin), | 31 : plugin_(plugin), |
(...skipping 24 matching lines...) Expand all Loading... |
55 load_manually_(false), | 56 load_manually_(false), |
56 in_close_streams_(false), | 57 in_close_streams_(false), |
57 next_timer_id_(1), | 58 next_timer_id_(1), |
58 next_notify_id_(0), | 59 next_notify_id_(0), |
59 next_range_request_id_(0), | 60 next_range_request_id_(0), |
60 handles_url_redirects_(false) { | 61 handles_url_redirects_(false) { |
61 npp_ = new NPP_t(); | 62 npp_ = new NPP_t(); |
62 npp_->ndata = 0; | 63 npp_->ndata = 0; |
63 npp_->pdata = 0; | 64 npp_->pdata = 0; |
64 | 65 |
| 66 if (mime_type_ == kFlashPluginSwfMimeType) |
| 67 transparent_ = false; |
| 68 |
65 memset(&zero_padding_, 0, sizeof(zero_padding_)); | 69 memset(&zero_padding_, 0, sizeof(zero_padding_)); |
66 DCHECK(message_loop_); | 70 DCHECK(message_loop_); |
67 } | 71 } |
68 | 72 |
69 PluginInstance::~PluginInstance() { | 73 PluginInstance::~PluginInstance() { |
70 CloseStreams(); | 74 CloseStreams(); |
71 | 75 |
72 if (npp_ != 0) { | 76 if (npp_ != 0) { |
73 delete npp_; | 77 delete npp_; |
74 npp_ = 0; | 78 npp_ = 0; |
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
677 plugin_stream->UpdateUrl( | 681 plugin_stream->UpdateUrl( |
678 plugin_stream->pending_redirect_url().c_str()); | 682 plugin_stream->pending_redirect_url().c_str()); |
679 } | 683 } |
680 break; | 684 break; |
681 } | 685 } |
682 } | 686 } |
683 } | 687 } |
684 | 688 |
685 } // namespace npapi | 689 } // namespace npapi |
686 } // namespace webkit | 690 } // namespace webkit |
OLD | NEW |