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

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

Issue 321933002: Revert 274770 "Ensure that in-process plugins can't destroy them..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 3191 matching lines...) Expand 10 before | Expand all | Expand 10 after
3202 if (lock_target_.get()) { 3202 if (lock_target_.get()) {
3203 GetMouseLockDispatcher()->OnLockTargetDestroyed(lock_target_.get()); 3203 GetMouseLockDispatcher()->OnLockTargetDestroyed(lock_target_.get());
3204 lock_target_.reset(); 3204 lock_target_.reset();
3205 } 3205 }
3206 } 3206 }
3207 3207
3208 void PepperPluginInstanceImpl::DidDataFromWebURLResponse( 3208 void PepperPluginInstanceImpl::DidDataFromWebURLResponse(
3209 const blink::WebURLResponse& response, 3209 const blink::WebURLResponse& response,
3210 int pending_host_id, 3210 int pending_host_id,
3211 const ppapi::URLResponseInfoData& data) { 3211 const ppapi::URLResponseInfoData& data) {
3212 if (is_deleted_)
3213 return;
3214
3215 RendererPpapiHostImpl* host_impl = module_->renderer_ppapi_host(); 3212 RendererPpapiHostImpl* host_impl = module_->renderer_ppapi_host();
3216 3213
3217 if (host_impl->in_process_router()) { 3214 if (host_impl->in_process_router()) {
3218 // Running in-process, we can just create the resource and call the 3215 // Running in-process, we can just create the resource and call the
3219 // PPP_Instance function directly. 3216 // PPP_Instance function directly.
3220 scoped_refptr<ppapi::proxy::URLLoaderResource> loader_resource( 3217 scoped_refptr<ppapi::proxy::URLLoaderResource> loader_resource(
3221 new ppapi::proxy::URLLoaderResource( 3218 new ppapi::proxy::URLLoaderResource(
3222 host_impl->in_process_router()->GetPluginConnection(pp_instance()), 3219 host_impl->in_process_router()->GetPluginConnection(pp_instance()),
3223 pp_instance(), 3220 pp_instance(),
3224 pending_host_id, 3221 pending_host_id,
(...skipping 11 matching lines...) Expand all
3236 // Running out-of-process. Initiate an IPC call to notify the plugin 3233 // Running out-of-process. Initiate an IPC call to notify the plugin
3237 // process. 3234 // process.
3238 ppapi::proxy::HostDispatcher* dispatcher = 3235 ppapi::proxy::HostDispatcher* dispatcher =
3239 ppapi::proxy::HostDispatcher::GetForInstance(pp_instance()); 3236 ppapi::proxy::HostDispatcher::GetForInstance(pp_instance());
3240 dispatcher->Send(new PpapiMsg_PPPInstance_HandleDocumentLoad( 3237 dispatcher->Send(new PpapiMsg_PPPInstance_HandleDocumentLoad(
3241 ppapi::API_ID_PPP_INSTANCE, pp_instance(), pending_host_id, data)); 3238 ppapi::API_ID_PPP_INSTANCE, pp_instance(), pending_host_id, data));
3242 } 3239 }
3243 } 3240 }
3244 3241
3245 } // namespace content 3242 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698