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

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

Issue 848863002: PPAPI: implement GetSupportedPreviewSizes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update histogram.xml with pepper_hash_for_uma Created 5 years, 10 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
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/content_renderer_pepper_host_factory.h" 5 #include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "content/common/content_switches_internal.h" 9 #include "content/common/content_switches_internal.h"
10 #include "content/public/common/content_client.h" 10 #include "content/public/common/content_client.h"
11 #include "content/public/renderer/content_renderer_client.h" 11 #include "content/public/renderer/content_renderer_client.h"
12 #include "content/renderer/pepper/pepper_audio_input_host.h" 12 #include "content/renderer/pepper/pepper_audio_input_host.h"
13 #include "content/renderer/pepper/pepper_compositor_host.h" 13 #include "content/renderer/pepper/pepper_compositor_host.h"
14 #include "content/renderer/pepper/pepper_file_chooser_host.h" 14 #include "content/renderer/pepper/pepper_file_chooser_host.h"
15 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h" 15 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
16 #include "content/renderer/pepper/pepper_file_system_host.h" 16 #include "content/renderer/pepper/pepper_file_system_host.h"
17 #include "content/renderer/pepper/pepper_graphics_2d_host.h" 17 #include "content/renderer/pepper/pepper_graphics_2d_host.h"
18 #include "content/renderer/pepper/pepper_image_capture_host.h"
18 #include "content/renderer/pepper/pepper_media_stream_video_track_host.h" 19 #include "content/renderer/pepper/pepper_media_stream_video_track_host.h"
19 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 20 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
20 #include "content/renderer/pepper/pepper_url_loader_host.h" 21 #include "content/renderer/pepper/pepper_url_loader_host.h"
21 #include "content/renderer/pepper/pepper_video_capture_host.h" 22 #include "content/renderer/pepper/pepper_video_capture_host.h"
22 #include "content/renderer/pepper/pepper_video_decoder_host.h" 23 #include "content/renderer/pepper/pepper_video_decoder_host.h"
23 #include "content/renderer/pepper/pepper_video_destination_host.h" 24 #include "content/renderer/pepper/pepper_video_destination_host.h"
24 #include "content/renderer/pepper/pepper_video_source_host.h" 25 #include "content/renderer/pepper/pepper_video_source_host.h"
25 #include "content/renderer/pepper/pepper_websocket_host.h" 26 #include "content/renderer/pepper/pepper_websocket_host.h"
26 #include "content/renderer/pepper/ppb_image_data_impl.h" 27 #include "content/renderer/pepper/ppb_image_data_impl.h"
27 #include "content/renderer/pepper/renderer_ppapi_host_impl.h" 28 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 new PepperVideoCaptureHost(host_, instance, resource); 194 new PepperVideoCaptureHost(host_, instance, resource);
194 if (!host->Init()) { 195 if (!host->Init()) {
195 delete host; 196 delete host;
196 return scoped_ptr<ResourceHost>(); 197 return scoped_ptr<ResourceHost>();
197 } 198 }
198 return scoped_ptr<ResourceHost>(host); 199 return scoped_ptr<ResourceHost>(host);
199 } 200 }
200 } 201 }
201 } 202 }
202 203
204 // Private interfaces.
205 if (GetPermissions().HasPermission(ppapi::PERMISSION_PRIVATE)) {
206 switch (message.type()) {
207 case PpapiHostMsg_ImageCapture_Create::ID: {
208 scoped_ptr<PepperImageCaptureHost> host(
209 new PepperImageCaptureHost(host_, instance, resource));
210 return host->Init() ? scoped_ptr<ResourceHost>(host.Pass())
dcheng 2015/02/12 21:47:20 return host->Init() ? host : nullptr; should work
Justin Chuang 2015/02/16 19:15:23 Actually no, it needs to upcast to ResourceHost in
dcheng 2015/02/16 19:24:22 return host->Init() ? host.Pass() : nullptr; shou
Justin Chuang 2015/02/16 19:54:22 You're right. Pass() properly handles upcast. cl u
211 : scoped_ptr<ResourceHost>();
212 }
213 }
214 }
215
203 return scoped_ptr<ResourceHost>(); 216 return scoped_ptr<ResourceHost>();
204 } 217 }
205 218
206 const ppapi::PpapiPermissions& 219 const ppapi::PpapiPermissions&
207 ContentRendererPepperHostFactory::GetPermissions() const { 220 ContentRendererPepperHostFactory::GetPermissions() const {
208 return host_->GetPpapiHost()->permissions(); 221 return host_->GetPpapiHost()->permissions();
209 } 222 }
210 223
211 } // namespace content 224 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698