diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 00:02:02 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 00:02:02 +0000 |
| commit | f301d73608fb80398f1bb6b91e236bf2ab2eb708 (patch) | |
| tree | 82195621d919ed37176cd3ef6e34c48d9871f0e8 /media/video | |
| parent | 93c657cc3f043ec0699336217051ecc99284b1e7 (diff) | |
| download | chromium_src-f301d73608fb80398f1bb6b91e236bf2ab2eb708.zip chromium_src-f301d73608fb80398f1bb6b91e236bf2ab2eb708.tar.gz chromium_src-f301d73608fb80398f1bb6b91e236bf2ab2eb708.tar.bz2 | |
Roll webrtc 4143:4179
R=alexeypa@chromium.org, ronghuawu@chromium.org
Review URL: https://codereview.chromium.org/16383002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
| -rw-r--r-- | media/video/capture/screen/differ_unittest.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/media/video/capture/screen/differ_unittest.cc b/media/video/capture/screen/differ_unittest.cc index 5a44315..dab540d 100644 --- a/media/video/capture/screen/differ_unittest.cc +++ b/media/video/capture/screen/differ_unittest.cc @@ -558,10 +558,10 @@ TEST_F(DifferTest, MergeBlocks_MultiRect) { // +---+---+---+---+ +---+---+---+ // | | | X | _ | | | | 0 | - // +---+---+---+---+ +---+---+ + - // | X | X | X | _ | | 1 1 | 0 | - // +---+---+---+---+ => + | + - // | X | X | X | _ | | 1 1 | 0 | + // +---+---+---+---+ +---+---+---+ + // | X | X | X | _ | | 1 1 1 | + // +---+---+---+---+ => + + + // | X | X | X | _ | | 1 1 1 | // +---+---+---+---+ +---+---+---+ // | _ | _ | _ | _ | // +---+---+---+---+ @@ -573,15 +573,15 @@ TEST_F(DifferTest, MergeBlocks_MultiRect) { MergeBlocks(&dirty); ASSERT_EQ(2, RegionRectCount(dirty)); - ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 0, 1, 3)); - ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 2, 2)); + ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 0, 1, 1)); + ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 3, 2)); // +---+---+---+---+ +---+---+---+ // | | | | _ | | | | | // +---+---+---+---+ +---+---+---+ // | X | | X | _ | | 0 | | 1 | - // +---+---+---+---+ => + +---+ + - // | X | X | X | _ | | 0 | 2 | 1 | + // +---+---+---+---+ => +---+---+---+ + // | X | X | X | _ | | 2 2 2 | // +---+---+---+---+ +---+---+---+ // | _ | _ | _ | _ | // +---+---+---+---+ @@ -594,16 +594,16 @@ TEST_F(DifferTest, MergeBlocks_MultiRect) { MergeBlocks(&dirty); ASSERT_EQ(3, RegionRectCount(dirty)); - ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 2)); - ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 1, 1, 2)); - ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 1, 2, 1, 1)); + ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 1)); + ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 1, 1, 1)); + ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 2, 3, 1)); // +---+---+---+---+ +---+---+---+ // | X | X | X | _ | | 0 0 0 | // +---+---+---+---+ +---+---+---+ // | X | | X | _ | | 1 | | 2 | - // +---+---+---+---+ => + +---+ + - // | X | X | X | _ | | 1 | 3 | 2 | + // +---+---+---+---+ => +---+---+---+ + // | X | X | X | _ | | 3 3 3 | // +---+---+---+---+ +---+---+---+ // | _ | _ | _ | _ | // +---+---+---+---+ @@ -618,9 +618,9 @@ TEST_F(DifferTest, MergeBlocks_MultiRect) { ASSERT_EQ(4, RegionRectCount(dirty)); ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 0, 3, 1)); - ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 2)); - ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 1, 1, 2)); - ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 1, 2, 1, 1)); + ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 1, 1, 1)); + ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 2, 1, 1, 1)); + ASSERT_TRUE(CheckDirtyRegionContainsRect(dirty, 0, 2, 3, 1)); // +---+---+---+---+ +---+---+---+ // | X | X | | _ | | 0 0 | | |