Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Side by Side Diff: content/renderer/pepper/pepper_plugin_instance_impl.cc

Issue 1122863003: Revert of Pepper: Fix reentrancy problem in PepperPluginInstanceImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
3141 if (flash_fullscreen_) 3138 if (flash_fullscreen_)
3142 return true; 3139 return true;
3143 3140
3144 return container_->isRectTopmost(rect); 3141 return container_->isRectTopmost(rect);
3145 } 3142 }
3146 3143
3147 int32_t PepperPluginInstanceImpl::Navigate( 3144 int32_t PepperPluginInstanceImpl::Navigate(
3148 const ppapi::URLRequestInfoData& request, 3145 const ppapi::URLRequestInfoData& request,
3149 const char* target, 3146 const char* target,
3150 bool from_user_action) { 3147 bool from_user_action) {
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
3342 3339
3343 void PepperPluginInstanceImpl::RecordFlashJavaScriptUse() { 3340 void PepperPluginInstanceImpl::RecordFlashJavaScriptUse() {
3344 if (initialized_ && !javascript_used_ && is_flash_plugin_) { 3341 if (initialized_ && !javascript_used_ && is_flash_plugin_) {
3345 javascript_used_ = true; 3342 javascript_used_ = true;
3346 RenderThread::Get()->RecordAction( 3343 RenderThread::Get()->RecordAction(
3347 base::UserMetricsAction("Flash.JavaScriptUsed")); 3344 base::UserMetricsAction("Flash.JavaScriptUsed"));
3348 } 3345 }
3349 } 3346 }
3350 3347
3351 } // namespace content 3348 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698