Chromium Code Reviews| Index: remoting/client/plugin/pepper_video_renderer_3d.h |
| diff --git a/remoting/client/plugin/pepper_video_renderer_3d.h b/remoting/client/plugin/pepper_video_renderer_3d.h |
| index 04fb123cbf5ba6687039e2d3e3c2e4f959251e67..5c04ce5f52c00e6e3f14c645e31d7a2e43fdcfef 100644 |
| --- a/remoting/client/plugin/pepper_video_renderer_3d.h |
| +++ b/remoting/client/plugin/pepper_video_renderer_3d.h |
| @@ -34,14 +34,14 @@ class PepperVideoRenderer3D : public PepperVideoRenderer, |
| ~PepperVideoRenderer3D() override; |
| // PepperVideoRenderer interface. |
| - bool Initialize(pp::Instance* instance, |
| - const ClientContext& context, |
| - EventHandler* event_handler, |
| - protocol::PerformanceTracker* perf_tracker) override; |
| + void SetPepperContext(pp::Instance* instance, |
| + EventHandler* event_handler) override; |
| void OnViewChanged(const pp::View& view) override; |
| void EnableDebugDirtyRegion(bool enable) override; |
| // VideoRenderer interface. |
| + bool Initialize(const ClientContext& client_context, |
| + protocol::PerformanceTracker* perf_tracker) override; |
| void OnSessionConfig(const protocol::SessionConfig& config) override; |
| protocol::VideoStub* GetVideoStub() override; |
| protocol::FrameConsumer* GetFrameConsumer() override; |
| @@ -91,6 +91,7 @@ class PepperVideoRenderer3D : public PepperVideoRenderer, |
| // CHECKs that the last OpenGL call has completed successfully. |
| void CheckGLError(); |
| + pp::Instance* instance_ = nullptr; |
|
Sergey Ulanov
2016/06/29 23:02:12
call it pp_instance_ please
Yuwei
2016/06/29 23:38:02
Done.
|
| EventHandler* event_handler_ = nullptr; |
| protocol::PerformanceTracker* perf_tracker_ = nullptr; |