diff options
author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 02:53:50 +0000 |
---|---|---|
committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 02:53:50 +0000 |
commit | bfe3010dd8c3dfc7a62d791bacdc51569ca94055 (patch) | |
tree | b6afadaac6596e4f3435f221a9dfd525c2d43600 /remoting/client/rectangle_update_decoder.cc | |
parent | 0f514a875652950650f1c51164a62660fac28dc6 (diff) | |
download | chromium_src-bfe3010dd8c3dfc7a62d791bacdc51569ca94055.zip chromium_src-bfe3010dd8c3dfc7a62d791bacdc51569ca94055.tar.gz chromium_src-bfe3010dd8c3dfc7a62d791bacdc51569ca94055.tar.bz2 |
Replace RectVectors with SkRegions in Decoder.
BUG=105401
Review URL: http://codereview.chromium.org/9277001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/rectangle_update_decoder.cc')
-rw-r--r-- | remoting/client/rectangle_update_decoder.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc index 3ce8b65..673c2a0 100644 --- a/remoting/client/rectangle_update_decoder.cc +++ b/remoting/client/rectangle_update_decoder.cc @@ -140,7 +140,7 @@ void RectangleUpdateDecoder::SetOutputSize(const SkISize& size) { // TODO(wez): Refresh the frame only if the ratio has changed. if (frame_) { SkIRect frame_rect = SkIRect::MakeWH(frame_->width(), frame_->height()); - refresh_rects_.push_back(frame_rect); + refresh_region_.op(frame_rect, SkRegion::kUnion_Op); } // TODO(hclam): If the scale ratio has changed we should reallocate a @@ -166,7 +166,7 @@ void RectangleUpdateDecoder::UpdateClipRect(const SkIRect& new_clip_rect) { // TODO(wez): Only refresh newly-exposed portions of the frame. if (frame_) { SkIRect frame_rect = SkIRect::MakeWH(frame_->width(), frame_->height()); - refresh_rects_.push_back(frame_rect); + refresh_region_.op(frame_rect, SkRegion::kUnion_Op); } clip_rect_ = new_clip_rect; @@ -188,9 +188,9 @@ void RectangleUpdateDecoder::RefreshFullFrame() { if (!frame_ || !decoder_.get()) return; - refresh_rects_.push_back( - SkIRect::MakeWH(static_cast<int>(frame_->width()), - static_cast<int>(frame_->height()))); + SkIRect frame_rect = SkIRect::MakeWH(frame_->width(), frame_->height()); + refresh_region_.op(frame_rect, SkRegion::kUnion_Op); + DoRefresh(); } @@ -200,33 +200,33 @@ void RectangleUpdateDecoder::SubmitToConsumer() { if (!frame_) return; - RectVector* dirty_rects = new RectVector(); - decoder_->GetUpdatedRects(dirty_rects); + SkRegion* dirty_region = new SkRegion; + decoder_->GetUpdatedRegion(dirty_region); - consumer_->OnPartialFrameOutput(frame_, dirty_rects, base::Bind( - &RectangleUpdateDecoder::OnFrameConsumed, this, dirty_rects)); + consumer_->OnPartialFrameOutput(frame_, dirty_region, base::Bind( + &RectangleUpdateDecoder::OnFrameConsumed, this, dirty_region)); } void RectangleUpdateDecoder::DoRefresh() { DCHECK(message_loop_->BelongsToCurrentThread()); - if (refresh_rects_.empty()) + if (refresh_region_.isEmpty()) return; - decoder_->RefreshRects(refresh_rects_); - refresh_rects_.clear(); + decoder_->RefreshRegion(refresh_region_); + refresh_region_.setEmpty(); SubmitToConsumer(); } -void RectangleUpdateDecoder::OnFrameConsumed(RectVector* rects) { +void RectangleUpdateDecoder::OnFrameConsumed(SkRegion* region) { if (!message_loop_->BelongsToCurrentThread()) { message_loop_->PostTask( FROM_HERE, base::Bind(&RectangleUpdateDecoder::OnFrameConsumed, - this, rects)); + this, region)); return; } - delete rects; + delete region; DoRefresh(); } |