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

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

Issue 116443009: Handle plugin instance crash in ContentDecryptorDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 11 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 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 // Force free all resources and vars. 711 // Force free all resources and vars.
712 HostGlobals::Get()->InstanceCrashed(pp_instance()); 712 HostGlobals::Get()->InstanceCrashed(pp_instance());
713 713
714 // Free any associated graphics. 714 // Free any associated graphics.
715 SetFullscreen(false); 715 SetFullscreen(false);
716 FlashSetFullscreen(false, false); 716 FlashSetFullscreen(false, false);
717 // Unbind current 2D or 3D graphics context. 717 // Unbind current 2D or 3D graphics context.
718 BindGraphics(pp_instance(), 0); 718 BindGraphics(pp_instance(), 0);
719 InvalidateRect(gfx::Rect()); 719 InvalidateRect(gfx::Rect());
720 720
721 if (content_decryptor_delegate_) {
722 content_decryptor_delegate_->InstanceCrashed();
723 content_decryptor_delegate_.reset();
724 }
725
721 render_frame_->PluginCrashed(module_->path(), module_->GetPeerProcessId()); 726 render_frame_->PluginCrashed(module_->path(), module_->GetPeerProcessId());
722 UnSetAndDeleteLockTargetAdapter(); 727 UnSetAndDeleteLockTargetAdapter();
723 } 728 }
724 729
725 static void SetGPUHistogram(const ppapi::Preferences& prefs, 730 static void SetGPUHistogram(const ppapi::Preferences& prefs,
726 const std::vector<std::string>& arg_names, 731 const std::vector<std::string>& arg_names,
727 const std::vector<std::string>& arg_values) { 732 const std::vector<std::string>& arg_values) {
728 // Calculate a histogram to let us determine how likely people are to try to 733 // Calculate a histogram to let us determine how likely people are to try to
729 // run Stage3D content on machines that have it blacklisted. 734 // run Stage3D content on machines that have it blacklisted.
730 #if defined(OS_WIN) 735 #if defined(OS_WIN)
(...skipping 2346 matching lines...) Expand 10 before | Expand all | Expand 10 after
3077 // Running out-of-process. Initiate an IPC call to notify the plugin 3082 // Running out-of-process. Initiate an IPC call to notify the plugin
3078 // process. 3083 // process.
3079 ppapi::proxy::HostDispatcher* dispatcher = 3084 ppapi::proxy::HostDispatcher* dispatcher =
3080 ppapi::proxy::HostDispatcher::GetForInstance(pp_instance()); 3085 ppapi::proxy::HostDispatcher::GetForInstance(pp_instance());
3081 dispatcher->Send(new PpapiMsg_PPPInstance_HandleDocumentLoad( 3086 dispatcher->Send(new PpapiMsg_PPPInstance_HandleDocumentLoad(
3082 ppapi::API_ID_PPP_INSTANCE, pp_instance(), pending_host_id, data)); 3087 ppapi::API_ID_PPP_INSTANCE, pp_instance(), pending_host_id, data));
3083 } 3088 }
3084 } 3089 }
3085 3090
3086 } // namespace content 3091 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698