cc: Made image comparison for pixel tests error tolerant.

cc/gl_renderer_pixeltest.cc

 // Copyright 2012 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 "cc/gl_renderer.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "cc/compositor_frame_metadata.h"
 #include "cc/draw_quad.h"
@@ skipping 46 matching lines @@
         new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl);
     context3d->Initialize(WebKit::WebGraphicsContext3D::Attributes(), NULL);
     output_surface_.reset(new OutputSurface(
         context3d.PassAs<WebKit::WebGraphicsContext3D>()));
     resource_provider_ = ResourceProvider::create(output_surface_.get());
     renderer_ = GLRenderer::create(&fake_client_,
                                    output_surface_.get(),
                                    resource_provider_.get());
   }
 
-  bool PixelsMatchReference(base::FilePath ref_file, gfx::Rect viewport_rect) {
+  bool PixelsMatchReference(base::FilePath ref_file, gfx::Rect viewport_rect,

[danakj, 2013/03/18 17:45:22]

This code moved to cc/test/pixel_test.h|cc

[ernstm, 2013/03/18 20:19:39]

Done.

+                            const PixelComparator& comparator) {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                      viewport_rect.width(), viewport_rect.height());
     bitmap.allocPixels();
     unsigned char* pixels = static_cast<unsigned char*>(bitmap.getPixels());
     renderer_->getFramebufferPixels(pixels, viewport_rect);
 
     base::FilePath test_data_dir;
     if (!PathService::Get(cc::DIR_TEST_DATA, &test_data_dir))
       return false;
 
-    return IsSameAsPNGFile(bitmap, test_data_dir.Append(ref_file));
+    return MatchesPNGFile(bitmap, test_data_dir.Append(ref_file), comparator);
   }
 
   scoped_ptr<OutputSurface> output_surface_;
   FakeRendererClient fake_client_;
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<GLRenderer> renderer_;
 };
 
 scoped_ptr<RenderPass> CreateTestRenderPass(RenderPass::Id id, gfx::Rect rect) {
   scoped_ptr<RenderPass> pass = RenderPass::Create();
@@ skipping 55 matching lines @@
 
   pass->quad_list.push_back(color_quad.PassAs<DrawQuad>());
 
   RenderPassList pass_list;
   pass_list.push_back(pass.Pass());
 
   renderer_->drawFrame(pass_list);
 
   EXPECT_TRUE(PixelsMatchReference(
       base::FilePath(FILE_PATH_LITERAL("green.png")),
-      rect));
+      rect, ExactPixelComparator()));
 }
 
 TEST_F(GLRendererPixelTest, RenderPassChangesSize) {
   gfx::Rect viewport_rect(200, 200);
 
   RenderPass::Id root_pass_id(1, 1);
   scoped_ptr<RenderPass> root_pass =
       CreateTestRenderPass(root_pass_id, viewport_rect);
 
   RenderPass::Id child_pass_id(2, 2);
@@ skipping 22 matching lines @@
 
   RenderPassList pass_list;
   pass_list.push_back(child_pass.Pass());
   pass_list.push_back(root_pass.Pass());
 
   renderer_->setEnlargePassTextureAmountForTesting(gfx::Vector2d(50, 75));
   renderer_->decideRenderPassAllocationsForFrame(pass_list);
   renderer_->drawFrame(pass_list);
 
   EXPECT_TRUE(PixelsMatchReference(
-      base::FilePath(FILE_PATH_LITERAL("blue_yellow.png")), viewport_rect));
+      base::FilePath(FILE_PATH_LITERAL("blue_yellow.png")), viewport_rect,
+      ExactPixelComparator()));
 }
 #endif
 
 }  // namespace
 }  // namespace cc