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

Side by Side Diff: webkit/plugins/ppapi/plugin_module.cc

Issue 11820009: Distinguish plugin disconnections from plugin crashes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.h ('k') | 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 "webkit/plugins/ppapi/plugin_module.h" 5 #include "webkit/plugins/ppapi/plugin_module.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 // In NaCl, we need to tell the instance to reset itself as proxied. This will 519 // In NaCl, we need to tell the instance to reset itself as proxied. This will
520 // clear cached interface pointers and send DidCreate (etc) to the plugin 520 // clear cached interface pointers and send DidCreate (etc) to the plugin
521 // side of the proxy. 521 // side of the proxy.
522 return instance->ResetAsProxied(this); 522 return instance->ResetAsProxied(this);
523 } 523 }
524 524
525 bool PluginModule::IsProxied() const { 525 bool PluginModule::IsProxied() const {
526 return !!out_of_process_proxy_; 526 return !!out_of_process_proxy_;
527 } 527 }
528 528
529 base::ProcessId PluginModule::GetPeerProcessId() {
530 if (out_of_process_proxy_.get())
531 return out_of_process_proxy_->GetPeerProcessId();
532 return base::kNullProcessId;
533 }
534
529 // static 535 // static
530 const PPB_Core* PluginModule::GetCore() { 536 const PPB_Core* PluginModule::GetCore() {
531 return &core_interface; 537 return &core_interface;
532 } 538 }
533 539
534 // static 540 // static
535 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() { 541 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() {
536 return &GetInterface; 542 return &GetInterface;
537 } 543 }
538 544
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 633 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
628 if (retval != 0) { 634 if (retval != 0) {
629 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 635 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
630 return false; 636 return false;
631 } 637 }
632 return true; 638 return true;
633 } 639 }
634 640
635 } // namespace ppapi 641 } // namespace ppapi
636 } // namespace webkit 642 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698