Index: remoting/client/plugin/pepper_video_renderer_3d.cc |
diff --git a/remoting/client/plugin/pepper_video_renderer_3d.cc b/remoting/client/plugin/pepper_video_renderer_3d.cc |
index 9883ad390ad32762dff39dbd440a12d37b781ed4..054a455bd25832c45bdf4dc1a1768c064835192f 100644 |
--- a/remoting/client/plugin/pepper_video_renderer_3d.cc |
+++ b/remoting/client/plugin/pepper_video_renderer_3d.cc |
@@ -78,16 +78,13 @@ PepperVideoRenderer3D::~PepperVideoRenderer3D() { |
gles2_if_->DeleteProgram(graphics_.pp_resource(), shader_program_); |
} |
-bool PepperVideoRenderer3D::Initialize( |
+bool PepperVideoRenderer3D::SetPepperContext( |
Sergey Ulanov
2016/06/28 19:08:01
It's strange that Set* method returns boolean valu
Yuwei
2016/06/28 21:43:03
Done. Store pp::Instance* here and use later in In
|
pp::Instance* instance, |
- const ClientContext& context, |
- EventHandler* event_handler, |
- protocol::PerformanceTracker* perf_tracker) { |
+ EventHandler* event_handler) { |
DCHECK(event_handler); |
DCHECK(!event_handler_); |
event_handler_ = event_handler; |
- perf_tracker_ = perf_tracker; |
const int32_t context_attributes[] = { |
PP_GRAPHICS3DATTRIB_ALPHA_SIZE, 8, |
@@ -161,6 +158,13 @@ void PepperVideoRenderer3D::EnableDebugDirtyRegion(bool enable) { |
debug_dirty_region_ = enable; |
} |
+bool PepperVideoRenderer3D::Initialize( |
+ const ClientContext& context, |
+ protocol::PerformanceTracker* perf_tracker) { |
+ perf_tracker_ = perf_tracker; |
+ return true; |
+} |
+ |
void PepperVideoRenderer3D::OnSessionConfig( |
const protocol::SessionConfig& config) { |
PP_VideoProfile video_profile = PP_VIDEOPROFILE_VP8_ANY; |