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 "content/renderer/pepper/pepper_plugin_instance_impl.h" | 5 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/linked_ptr.h" | 10 #include "base/memory/linked_ptr.h" |
(...skipping 3117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3128 base::MessageLoop::current()->PostTask( | 3128 base::MessageLoop::current()->PostTask( |
3129 FROM_HERE, | 3129 FROM_HERE, |
3130 base::Bind(&PepperPluginInstanceImpl::ReportGeometry, this)); | 3130 base::Bind(&PepperPluginInstanceImpl::ReportGeometry, this)); |
3131 } | 3131 } |
3132 } | 3132 } |
3133 | 3133 |
3134 return true; | 3134 return true; |
3135 } | 3135 } |
3136 | 3136 |
3137 bool PepperPluginInstanceImpl::IsRectTopmost(const gfx::Rect& rect) { | 3137 bool PepperPluginInstanceImpl::IsRectTopmost(const gfx::Rect& rect) { |
| 3138 if (is_deleted_) |
| 3139 return false; |
| 3140 |
3138 if (flash_fullscreen_) | 3141 if (flash_fullscreen_) |
3139 return true; | 3142 return true; |
3140 | 3143 |
3141 return container_->isRectTopmost(rect); | 3144 return container_->isRectTopmost(rect); |
3142 } | 3145 } |
3143 | 3146 |
3144 int32_t PepperPluginInstanceImpl::Navigate( | 3147 int32_t PepperPluginInstanceImpl::Navigate( |
3145 const ppapi::URLRequestInfoData& request, | 3148 const ppapi::URLRequestInfoData& request, |
3146 const char* target, | 3149 const char* target, |
3147 bool from_user_action) { | 3150 bool from_user_action) { |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3339 | 3342 |
3340 void PepperPluginInstanceImpl::RecordFlashJavaScriptUse() { | 3343 void PepperPluginInstanceImpl::RecordFlashJavaScriptUse() { |
3341 if (initialized_ && !javascript_used_ && is_flash_plugin_) { | 3344 if (initialized_ && !javascript_used_ && is_flash_plugin_) { |
3342 javascript_used_ = true; | 3345 javascript_used_ = true; |
3343 RenderThread::Get()->RecordAction( | 3346 RenderThread::Get()->RecordAction( |
3344 base::UserMetricsAction("Flash.JavaScriptUsed")); | 3347 base::UserMetricsAction("Flash.JavaScriptUsed")); |
3345 } | 3348 } |
3346 } | 3349 } |
3347 | 3350 |
3348 } // namespace content | 3351 } // namespace content |
OLD | NEW |