| Index: remoting/base/decoder_row_based.cc
|
| ===================================================================
|
| --- remoting/base/decoder_row_based.cc (revision 118791)
|
| +++ remoting/base/decoder_row_based.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.
|
|
|
| @@ -44,7 +44,7 @@
|
| frame_ = NULL;
|
| decompressor_->Reset();
|
| state_ = kUninitialized;
|
| - updated_region_.setEmpty();
|
| + updated_rects_.clear();
|
| }
|
|
|
| bool DecoderRowBased::IsReadyForData() {
|
| @@ -128,7 +128,7 @@
|
| return DECODE_ERROR;
|
| }
|
|
|
| - updated_region_.op(clip_, SkRegion::kUnion_Op);
|
| + updated_rects_.push_back(clip_);
|
| decompressor_->Reset();
|
| }
|
|
|
| @@ -186,9 +186,9 @@
|
| return;
|
| }
|
|
|
| -void DecoderRowBased::GetUpdatedRegion(SkRegion* region) {
|
| - region->swap(updated_region_);
|
| - updated_region_.setEmpty();
|
| +void DecoderRowBased::GetUpdatedRects(RectVector* rects) {
|
| + rects->swap(updated_rects_);
|
| + updated_rects_.clear();
|
| }
|
|
|
| VideoPacketFormat::Encoding DecoderRowBased::Encoding() {
|
|
|