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

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

Issue 6981001: Make the Pepper proxy support in-process font rendering. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.h ('k') | webkit/plugins/ppapi/ppb_font_impl.h » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h" 98 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h"
99 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h" 99 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
100 #include "webkit/plugins/ppapi/ppb_url_request_info_impl.h" 100 #include "webkit/plugins/ppapi/ppb_url_request_info_impl.h"
101 #include "webkit/plugins/ppapi/ppb_url_response_info_impl.h" 101 #include "webkit/plugins/ppapi/ppb_url_response_info_impl.h"
102 #include "webkit/plugins/ppapi/ppb_url_util_impl.h" 102 #include "webkit/plugins/ppapi/ppb_url_util_impl.h"
103 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h" 103 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
104 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h" 104 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h"
105 #include "webkit/plugins/ppapi/ppb_widget_impl.h" 105 #include "webkit/plugins/ppapi/ppb_widget_impl.h"
106 #include "webkit/plugins/ppapi/resource_tracker.h" 106 #include "webkit/plugins/ppapi/resource_tracker.h"
107 #include "webkit/plugins/ppapi/var.h" 107 #include "webkit/plugins/ppapi/var.h"
108 #include "webkit/plugins/ppapi/webkit_forwarding_impl.h"
108 109
109 #ifdef ENABLE_GPU 110 #ifdef ENABLE_GPU
110 #include "webkit/plugins/ppapi/ppb_context_3d_impl.h" 111 #include "webkit/plugins/ppapi/ppb_context_3d_impl.h"
111 #include "webkit/plugins/ppapi/ppb_gles_chromium_texture_mapping_impl.h" 112 #include "webkit/plugins/ppapi/ppb_gles_chromium_texture_mapping_impl.h"
112 #include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h" 113 #include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h"
113 #include "webkit/plugins/ppapi/ppb_opengles_impl.h" 114 #include "webkit/plugins/ppapi/ppb_opengles_impl.h"
114 #include "webkit/plugins/ppapi/ppb_surface_3d_impl.h" 115 #include "webkit/plugins/ppapi/ppb_surface_3d_impl.h"
115 #endif // ENABLE_GPU 116 #endif // ENABLE_GPU
116 117
117 namespace webkit { 118 namespace webkit {
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 556
556 void PluginModule::SetBroker(PluginDelegate::PpapiBroker* broker) { 557 void PluginModule::SetBroker(PluginDelegate::PpapiBroker* broker) {
557 DCHECK(!broker_ || !broker); 558 DCHECK(!broker_ || !broker);
558 broker_ = broker; 559 broker_ = broker;
559 } 560 }
560 561
561 PluginDelegate::PpapiBroker* PluginModule::GetBroker(){ 562 PluginDelegate::PpapiBroker* PluginModule::GetBroker(){
562 return broker_; 563 return broker_;
563 } 564 }
564 565
566 pp::shared_impl::WebKitForwarding* PluginModule::GetWebKitForwarding() {
567 if (!webkit_forwarding_.get())
568 webkit_forwarding_.reset(new WebKitForwardingImpl);
569 return webkit_forwarding_.get();
570 }
571
565 bool PluginModule::InitializeModule() { 572 bool PluginModule::InitializeModule() {
566 DCHECK(!out_of_process_proxy_.get()) << "Don't call for proxied modules."; 573 DCHECK(!out_of_process_proxy_.get()) << "Don't call for proxied modules.";
567 int retval = entry_points_.initialize_module(pp_module(), &GetInterface); 574 int retval = entry_points_.initialize_module(pp_module(), &GetInterface);
568 if (retval != 0) { 575 if (retval != 0) {
569 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 576 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
570 return false; 577 return false;
571 } 578 }
572 return true; 579 return true;
573 } 580 }
574 581
575 } // namespace ppapi 582 } // namespace ppapi
576 } // namespace webkit 583 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.h ('k') | webkit/plugins/ppapi/ppb_font_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698