| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/renderer/webplugin_delegate_proxy.h" | 5 #include "chrome/renderer/webplugin_delegate_proxy.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/gfx/blit.h" | 9 #include "app/gfx/blit.h" |
| 10 #include "app/gfx/canvas.h" | 10 #include "app/gfx/canvas.h" |
| (...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 813 DCHECK(window_); | 813 DCHECK(window_); |
| 814 plugin_->WillDestroyWindow(window_); | 814 plugin_->WillDestroyWindow(window_); |
| 815 window_ = gfx::kNullPluginWindow; | 815 window_ = gfx::kNullPluginWindow; |
| 816 } | 816 } |
| 817 | 817 |
| 818 #if defined(OS_WIN) | 818 #if defined(OS_WIN) |
| 819 void WebPluginDelegateProxy::OnSetWindowlessPumpEvent( | 819 void WebPluginDelegateProxy::OnSetWindowlessPumpEvent( |
| 820 HANDLE modal_loop_pump_messages_event) { | 820 HANDLE modal_loop_pump_messages_event) { |
| 821 DCHECK(modal_loop_pump_messages_event_ == NULL); | 821 DCHECK(modal_loop_pump_messages_event_ == NULL); |
| 822 | 822 |
| 823 // Bug 25583: this can be null because some "virus scanners" block the |
| 824 // DuplicateHandle call in the plugin process. |
| 825 if (!modal_loop_pump_messages_event) |
| 826 return; |
| 827 |
| 823 modal_loop_pump_messages_event_.reset( | 828 modal_loop_pump_messages_event_.reset( |
| 824 new base::WaitableEvent(modal_loop_pump_messages_event)); | 829 new base::WaitableEvent(modal_loop_pump_messages_event)); |
| 825 } | 830 } |
| 826 #endif | 831 #endif |
| 827 | 832 |
| 828 void WebPluginDelegateProxy::OnCancelResource(int id) { | 833 void WebPluginDelegateProxy::OnCancelResource(int id) { |
| 829 if (plugin_) | 834 if (plugin_) |
| 830 plugin_->CancelResource(id); | 835 plugin_->CancelResource(id); |
| 831 } | 836 } |
| 832 | 837 |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1093 intptr_t existing_stream, bool notify_needed, intptr_t notify_data) { | 1098 intptr_t existing_stream, bool notify_needed, intptr_t notify_data) { |
| 1094 plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(), | 1099 plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(), |
| 1095 existing_stream, notify_needed, | 1100 existing_stream, notify_needed, |
| 1096 notify_data); | 1101 notify_data); |
| 1097 } | 1102 } |
| 1098 | 1103 |
| 1099 void WebPluginDelegateProxy::OnDeferResourceLoading(int resource_id, | 1104 void WebPluginDelegateProxy::OnDeferResourceLoading(int resource_id, |
| 1100 bool defer) { | 1105 bool defer) { |
| 1101 plugin_->SetDeferResourceLoading(resource_id, defer); | 1106 plugin_->SetDeferResourceLoading(resource_id, defer); |
| 1102 } | 1107 } |
| OLD | NEW |