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

Side by Side Diff: webrtc/modules/desktop_capture/desktop_region.cc

Issue 1323453003: Fixes for PNaCl build of remoting client plugin in chromium. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « webrtc/modules/desktop_capture/desktop_region.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 : region_(region), 504 : region_(region),
505 row_(region.rows_.begin()), 505 row_(region.rows_.begin()),
506 previous_row_(region.rows_.end()) { 506 previous_row_(region.rows_.end()) {
507 if (!IsAtEnd()) { 507 if (!IsAtEnd()) {
508 assert(row_->second->spans.size() > 0); 508 assert(row_->second->spans.size() > 0);
509 row_span_ = row_->second->spans.begin(); 509 row_span_ = row_->second->spans.begin();
510 UpdateCurrentRect(); 510 UpdateCurrentRect();
511 } 511 }
512 } 512 }
513 513
514 DesktopRegion::Iterator::~Iterator() {}
515
514 bool DesktopRegion::Iterator::IsAtEnd() const { 516 bool DesktopRegion::Iterator::IsAtEnd() const {
515 return row_ == region_.rows_.end(); 517 return row_ == region_.rows_.end();
516 } 518 }
517 519
518 void DesktopRegion::Iterator::Advance() { 520 void DesktopRegion::Iterator::Advance() {
519 assert(!IsAtEnd()); 521 assert(!IsAtEnd());
520 522
521 while (true) { 523 while (true) {
522 ++row_span_; 524 ++row_span_;
523 if (row_span_ == row_->second->spans.end()) { 525 if (row_span_ == row_->second->spans.end()) {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 previous = bottom_row; 560 previous = bottom_row;
559 ++bottom_row; 561 ++bottom_row;
560 } while (bottom_row != region_.rows_.end() && 562 } while (bottom_row != region_.rows_.end() &&
561 previous->second->bottom == bottom_row->second->top && 563 previous->second->bottom == bottom_row->second->top &&
562 IsSpanInRow(*bottom_row->second, *row_span_)); 564 IsSpanInRow(*bottom_row->second, *row_span_));
563 rect_ = DesktopRect::MakeLTRB(row_span_->left, row_->second->top, 565 rect_ = DesktopRect::MakeLTRB(row_span_->left, row_->second->top,
564 row_span_->right, bottom); 566 row_span_->right, bottom);
565 } 567 }
566 568
567 } // namespace webrtc 569 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/desktop_region.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698