summaryrefslogtreecommitdiffstats
path: root/remoting/client/plugin/pepper_view.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 03:23:23 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-24 03:23:23 +0000
commit22f58a413b507463f97804a947c732d9a1c7eec6 (patch)
treeeb5e11bb4ab6b25b220648cb346d2a6d712de133 /remoting/client/plugin/pepper_view.cc
parent4466cbde3ee2d518081872862e3cfe741731540e (diff)
downloadchromium_src-22f58a413b507463f97804a947c732d9a1c7eec6.zip
chromium_src-22f58a413b507463f97804a947c732d9a1c7eec6.tar.gz
chromium_src-22f58a413b507463f97804a947c732d9a1c7eec6.tar.bz2
Revert 118790 - Compile error due to missing operator== on SkRegion
Replace RectVectors with SkRegions in Decoder. BUG=105401 Review URL: http://codereview.chromium.org/9277001 TBR=wez@chromium.org Review URL: https://chromiumcodereview.appspot.com/9146030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/plugin/pepper_view.cc')
-rw-r--r--remoting/client/plugin/pepper_view.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc
index fe404c2..d8a776c 100644
--- a/remoting/client/plugin/pepper_view.cc
+++ b/remoting/client/plugin/pepper_view.cc
@@ -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 @@ void PepperView::SetHostSize(const SkISize& host_size) {
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 @@ void PepperView::PaintFrame(media::VideoFrame* frame, const SkRegion& region) {
// 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::ReleaseFrame(media::VideoFrame* frame) {
}
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();
}