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

Unified Diff: remoting/client/plugin/pepper_view.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/plugin/pepper_view.h ('k') | remoting/client/rectangle_update_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/pepper_view.cc
===================================================================
--- remoting/client/plugin/pepper_view.cc (revision 118791)
+++ remoting/client/plugin/pepper_view.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.
@@ -110,7 +110,7 @@
host_size.width(), host_size.height());
}
-void PepperView::PaintFrame(media::VideoFrame* frame, const SkRegion& region) {
+void PepperView::PaintFrame(media::VideoFrame* frame, RectVector* rects) {
DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
SetHostSize(SkISize::Make(frame->width(), frame->height()));
@@ -124,8 +124,8 @@
// Copy updated regions to the backing store and then paint the regions.
bool changes_made = false;
- for (SkRegion::Iterator i(region); !i.done(); i.next())
- changes_made |= PaintRect(frame, i.rect());
+ for (size_t i = 0; i < rects->size(); ++i)
+ changes_made |= PaintRect(frame, (*rects)[i]);
if (changes_made)
FlushGraphics(start_time);
@@ -313,13 +313,13 @@
}
void PepperView::OnPartialFrameOutput(media::VideoFrame* frame,
- SkRegion* region,
+ RectVector* rects,
const base::Closure& done) {
DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
// TODO(ajwong): Clean up this API to be async so we don't need to use a
// member variable as a hack.
- PaintFrame(frame, *region);
+ PaintFrame(frame, rects);
done.Run();
}
« no previous file with comments | « remoting/client/plugin/pepper_view.h ('k') | remoting/client/rectangle_update_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698