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 "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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
437 PluginDelegate::ModuleLifetime* lifetime_delegate) | 437 PluginDelegate::ModuleLifetime* lifetime_delegate) |
438 : lifetime_delegate_(lifetime_delegate), | 438 : lifetime_delegate_(lifetime_delegate), |
439 callback_tracker_(new ::ppapi::CallbackTracker), | 439 callback_tracker_(new ::ppapi::CallbackTracker), |
440 is_in_destructor_(false), | 440 is_in_destructor_(false), |
441 is_crashed_(false), | 441 is_crashed_(false), |
442 broker_(NULL), | 442 broker_(NULL), |
443 library_(NULL), | 443 library_(NULL), |
444 name_(name), | 444 name_(name), |
445 path_(path), | 445 path_(path), |
446 reserve_instance_id_(NULL) { | 446 reserve_instance_id_(NULL) { |
| 447 #if defined(OS_CHROMEOS) |
| 448 // TODO(xiyuan): Remove this once crosbug.com/26646 is resolved. |
| 449 LOG(ERROR) << "#### Create ppapi::PluginModule::PluginModule" |
| 450 << ", name=" << name |
| 451 << ", path=" << path.value(); |
| 452 #endif // defined (OS_CHROMEOS) |
447 // Ensure the globals object is created. | 453 // Ensure the globals object is created. |
448 if (!host_globals) | 454 if (!host_globals) |
449 host_globals = new HostGlobals; | 455 host_globals = new HostGlobals; |
450 | 456 |
451 memset(&entry_points_, 0, sizeof(entry_points_)); | 457 memset(&entry_points_, 0, sizeof(entry_points_)); |
452 pp_module_ = HostGlobals::Get()->AddModule(this); | 458 pp_module_ = HostGlobals::Get()->AddModule(this); |
453 GetMainThreadMessageLoop(); // Initialize the main thread message loop. | 459 GetMainThreadMessageLoop(); // Initialize the main thread message loop. |
454 GetLivePluginSet()->insert(this); | 460 GetLivePluginSet()->insert(this); |
455 } | 461 } |
456 | 462 |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
617 int retval = entry_points.initialize_module(pp_module(), &GetInterface); | 623 int retval = entry_points.initialize_module(pp_module(), &GetInterface); |
618 if (retval != 0) { | 624 if (retval != 0) { |
619 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; | 625 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; |
620 return false; | 626 return false; |
621 } | 627 } |
622 return true; | 628 return true; |
623 } | 629 } |
624 | 630 |
625 } // namespace ppapi | 631 } // namespace ppapi |
626 } // namespace webkit | 632 } // namespace webkit |
OLD | NEW |