Revert 96327 - Switch over to using SkRegions to calculate dirty areas.

remoting/host/screen_recorder_unittest.cc

 // 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.
 
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "remoting/base/base_mock_objects.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/host/screen_recorder.h"
 #include "remoting/proto/video.pb.h"
@@ skipping 13 matching lines @@
 using ::testing::InSequence;
 using ::testing::InvokeWithoutArgs;
 using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::SaveArg;
 
 namespace remoting {
 
 namespace {
 
-ACTION_P2(RunCallback, region, data) {
-  SkRegion& dirty_region = data->mutable_dirty_region();
-  dirty_region.op(region, SkRegion::kUnion_Op);
+ACTION_P2(RunCallback, rects, data) {
+  InvalidRects& dirty_rects = data->mutable_dirty_rects();
+  InvalidRects temp_rects;
+  std::set_union(dirty_rects.begin(), dirty_rects.end(),
+                 rects.begin(), rects.end(),
+                 std::inserter(temp_rects, temp_rects.begin()));
+  dirty_rects.swap(temp_rects);
   arg0->Run(data);
   delete arg0;
 }
 
 ACTION(FinishEncode) {
   scoped_ptr<VideoPacket> packet(new VideoPacket());
   packet->set_flags(VideoPacket::LAST_PACKET | VideoPacket::LAST_PARTITION);
   arg2->Run(packet.release());
   delete arg2;
 }
@@ skipping 49 matching lines @@
   MockCapturer capturer_;
   MockEncoder* encoder_;
   MessageLoop message_loop_;
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenRecorderTest);
 };
 
 // This test mocks capturer, encoder and network layer to operate one recording
 // cycle.
 TEST_F(ScreenRecorderTest, OneRecordCycle) {
-  SkRegion update_region(SkIRect::MakeXYWH(0, 0, 10, 10));
+  InvalidRects update_rects;
+  update_rects.insert(gfx::Rect(0, 0, 10, 10));
   DataPlanes planes;
   for (int i = 0; i < DataPlanes::kPlaneCount; ++i) {
     planes.data[i] = reinterpret_cast<uint8*>(i);
     planes.strides[i] = kWidth * 4;
   }
   gfx::Size size(kWidth, kHeight);
   scoped_refptr<CaptureData> data(new CaptureData(planes, size, kFormat));
   EXPECT_CALL(capturer_, InvalidateFullScreen());
 
   // First the capturer is called.
-  EXPECT_CALL(capturer_, CaptureInvalidRegion(NotNull()))
-      .WillOnce(RunCallback(update_region, data));
+  EXPECT_CALL(capturer_, CaptureInvalidRects(NotNull()))
+      .WillOnce(RunCallback(update_rects, data));
 
   // Expect the encoder be called.
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
       .WillOnce(FinishEncode());
 
   MockVideoStub video_stub;
   EXPECT_CALL(*connection_, video_stub())
       .WillRepeatedly(Return(&video_stub));
 
   // Expect the client be notified.
@@ skipping 15 matching lines @@
 
   // Make sure all tasks are completed.
   message_loop_.RunAllPending();
 }
 
 // This test mocks capturer, encoder and network layer to simulate one recording
 // cycle. When the first encoded packet is submitted to the network
 // ScreenRecorder is instructed to come to a complete stop. We expect the stop
 // sequence to be executed successfully.
 TEST_F(ScreenRecorderTest, StartAndStop) {
-  SkRegion update_region(SkIRect::MakeXYWH(0, 0, 10, 10));
+  InvalidRects update_rects;
+  update_rects.insert(gfx::Rect(0, 0, 10, 10));
   DataPlanes planes;
   for (int i = 0; i < DataPlanes::kPlaneCount; ++i) {
     planes.data[i] = reinterpret_cast<uint8*>(i);
     planes.strides[i] = kWidth * 4;
   }
 
   gfx::Size size(kWidth, kHeight);
   scoped_refptr<CaptureData> data(new CaptureData(planes, size, kFormat));
   EXPECT_CALL(capturer_, InvalidateFullScreen());
 
   // First the capturer is called.
-  EXPECT_CALL(capturer_, CaptureInvalidRegion(NotNull()))
-      .WillRepeatedly(RunCallback(update_region, data));
+  EXPECT_CALL(capturer_, CaptureInvalidRects(NotNull()))
+      .WillRepeatedly(RunCallback(update_rects, data));
 
   // Expect the encoder be called.
   EXPECT_CALL(*encoder_, Encode(data, false, NotNull()))
       .WillRepeatedly(FinishEncode());
 
   MockVideoStub video_stub;
   EXPECT_CALL(*connection_, video_stub())
       .WillRepeatedly(Return(&video_stub));
 
   // By default delete the arguments when ProcessVideoPacket is received.
@@ skipping 17 matching lines @@
   record_->Start();
   message_loop_.Run();
 }
 
 TEST_F(ScreenRecorderTest, StopWithoutStart) {
   record_->Stop(NewRunnableFunction(&QuitMessageLoop, &message_loop_));
   message_loop_.Run();
 }
 
 }  // namespace remoting