cc: Fix readback from non-root layers.

cc/test/pixel_test.h

 // Copyright 2013 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/file_util.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/pixel_comparator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/size.h"
 
 #ifndef CC_TEST_PIXEL_TEST_H_
 #define CC_TEST_PIXEL_TEST_H_
 
 namespace cc {
 class DirectRenderer;
 class GLRenderer;
 class SoftwareRenderer;
 class OutputSurface;
 class ResourceProvider;
 
 class PixelTest : public testing::Test {
  protected:
   PixelTest();
   virtual ~PixelTest();
 
   bool RunPixelTest(RenderPassList* pass_list,
                     const base::FilePath& ref_file,
                     const PixelComparator& comparator);
 
+  bool RunPixelTestWithReadbackTarget(RenderPassList* pass_list,
+                                      RenderPass* target,
+                                      const base::FilePath& ref_file,
+                                      const PixelComparator& comparator);
+
   gfx::Size device_viewport_size_;
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
   class PixelTestRendererClient;
   scoped_ptr<PixelTestRendererClient> fake_client_;
   scoped_ptr<DirectRenderer> renderer_;
   scoped_ptr<SkBitmap> result_bitmap_;
 
   void SetUpGLRenderer();
   void SetUpSoftwareRenderer();
@@ skipping 25 matching lines @@
 inline void RendererPixelTest<SoftwareRenderer>::SetUp() {
   SetUpSoftwareRenderer();
 }
 
 typedef RendererPixelTest<GLRenderer> GLRendererPixelTest;
 typedef RendererPixelTest<SoftwareRenderer> SoftwareRendererPixelTest;
 
 }  // namespace cc
 
 #endif  // CC_TEST_PIXEL_TEST_H_