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

Unified Diff: remoting/client/frame_consumer_proxy.cc

Issue 9146030: Revert 118790 - Compile error due to missing operator== on SkRegion (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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
« no previous file with comments | « remoting/client/frame_consumer_proxy.h ('k') | remoting/client/plugin/pepper_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/frame_consumer_proxy.cc
===================================================================
--- remoting/client/frame_consumer_proxy.cc (revision 118791)
+++ remoting/client/frame_consumer_proxy.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -48,17 +48,17 @@
}
void FrameConsumerProxy::OnPartialFrameOutput(media::VideoFrame* frame,
- SkRegion* region,
+ RectVector* rects,
const base::Closure& done) {
if (!frame_consumer_message_loop_->BelongsToCurrentThread()) {
frame_consumer_message_loop_->PostTask(FROM_HERE, base::Bind(
&FrameConsumerProxy::OnPartialFrameOutput, this,
- make_scoped_refptr(frame), region, done));
+ make_scoped_refptr(frame), rects, done));
return;
}
if (frame_consumer_)
- frame_consumer_->OnPartialFrameOutput(frame, region, done);
+ frame_consumer_->OnPartialFrameOutput(frame, rects, done);
}
void FrameConsumerProxy::Detach() {
« no previous file with comments | « remoting/client/frame_consumer_proxy.h ('k') | remoting/client/plugin/pepper_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698