Resubmit - Use SSE2 block differ for chromoting

remoting/host/differ_unittest.cc

 // Copyright (c) 2010 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/scoped_ptr.h"
 #include "remoting/host/differ.h"
+#include "remoting/host/differ_block.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace remoting {
 
-// 96x96 screen gives a 3x3 grid of blocks.
+// 96x96 screen gives a 4x4 grid of blocks.
 const int kScreenWidth= 96;
 const int kScreenHeight = 96;
-const int kBytesPerPixel = 3;
 const int kBytesPerRow = (kBytesPerPixel * kScreenWidth);
 
 class DifferTest : public testing::Test {
  public:
   DifferTest() {
   }
 
  protected:
   virtual void SetUp() {
     InitDiffer(kScreenWidth, kScreenHeight, kBytesPerPixel, kBytesPerRow);
@@ skipping 18 matching lines @@
   void ClearBuffer(uint8* buffer) {
     memset(buffer, 0, buffer_size_);
   }
 
   // Convenience wrapper for Differ's DiffBlock that calculates the appropriate
   // offset to the start of the desired block.
   DiffInfo DiffBlock(int block_x, int block_y) {
     // Offset from upper-left of buffer to upper-left of requested block.
     int block_offset = ((block_y * stride_) + (block_x * bytes_per_pixel_))
                         * kBlockSize;
-    return differ_->DiffBlock(prev_.get() + block_offset,
-                              curr_.get() + block_offset,
-                              stride_);
+    return BlockDifference(prev_.get() + block_offset,
+                           curr_.get() + block_offset,
+                           stride_);
   }
 
   // Write the pixel |value| into the specified block in the |buffer|.
   // This is a convenience wrapper around WritePixel().
   void WriteBlockPixel(uint8* buffer, int block_x, int block_y,
                        int pixel_x, int pixel_y, uint32 value) {
     WritePixel(buffer, (block_x * kBlockSize) + pixel_x,
                (block_y * kBlockSize) + pixel_y, value);
   }
 
@@ skipping 454 matching lines @@
 
   dirty.reset(new InvalidRects());
   differ_->MergeBlocks(dirty.get());
 
   ASSERT_EQ(2UL, dirty->size());
   CheckDirtyRect(*dirty.get(), 0, 0, 2, 2);
   CheckDirtyRect(*dirty.get(), 1, 2, 1, 1);
 }
 
 }  // namespace remoting