remoting/client/plugin/chromoting_instance.cc - Issue 1288063004: Simplify FrameConsumer interface. Remove FrameProducer interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 1288063004: Simplify FrameConsumer interface. Remove FrameProducer interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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 side-by-side diff with in-line comments

Download patch

« remoting/client/jni/jni_frame_consumer.cc ('K') | « remoting/client/jni/jni_frame_consumer.cc ('k') | remoting/client/plugin/pepper_video_renderer_2d.h » ('j') | remoting/client/plugin/pepper_video_renderer_2d.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/client/plugin/chromoting_instance.cc

diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc

index c0ad2d3eaacb7d6bf7807cc6c84a6aa6c9a4ede2..af8f201b872b60177929aa0d49d3f2142f72a003 100644

--- a/remoting/client/plugin/chromoting_instance.cc

+++ b/remoting/client/plugin/chromoting_instance.cc

@@ -558,9 +558,9 @@ void ChromotingInstance::HandleConnect(const base::DictionaryValue& data) {

input_handler_.set_input_stub(normalizing_input_filter_.get());

// Try initializing 3D video renderer.

- video_renderer_.reset(new PepperVideoRenderer3D());

- if (!video_renderer_->Initialize(this, context_, this))

- video_renderer_.reset();

+ // video_renderer_.reset(new PepperVideoRenderer3D());

+ // if (!video_renderer_->Initialize(this, context_, this))

+ // video_renderer_.reset();

Jamie 2015/08/19 20:52:10 Did you leave this commented out intentionally? If

Sergey Ulanov 2015/08/19 23:37:13 No. Commented it just to test the other changes in

// If we didn't initialize 3D renderer then use the 2D renderer.

if (!video_renderer_) {