Implement transform/clip support for Android WebView.

cc/test/pixel_test.h

Index: cc/test/pixel_test.h
diff --git a/cc/test/pixel_test.h b/cc/test/pixel_test.h
index c7dd7aaf94824f5a6d34de3e4c0fbc30909d865c..eb53e074bb7979aaa764aabd35bf148d14dc7f8e 100644
--- a/cc/test/pixel_test.h
+++ b/cc/test/pixel_test.h
@@ -4,6 +4,7 @@
 
 #include "base/file_util.h"
 #include "cc/output/gl_renderer.h"
+#include "cc/output/software_renderer.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/pixel_comparator.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -33,9 +34,10 @@ class PixelTest : public testing::Test {
                                       const PixelComparator& comparator);
 
   gfx::Size device_viewport_size_;
+  class PixelTestOutputSurface;
+  class PixelTestRendererClient;
   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_;
@@ -43,6 +45,9 @@ class PixelTest : public testing::Test {
   void SetUpGLRenderer(bool use_skia_gpu_backend);
   void SetUpSoftwareRenderer();
 
+  void ForceExpandedViewport(gfx::Size surface_expansion,
+                             gfx::Vector2d viewport_offset);
+
  private:
   void ReadbackResult(base::Closure quit_run_loop, scoped_ptr<SkBitmap> bitmap);
 
@@ -58,6 +63,7 @@ class RendererPixelTest : public PixelTest {
   }
 
   bool UseSkiaGPUBackend() const;
+  bool ExpandedViewport() const;
 
  protected:
   virtual void SetUp() OVERRIDE;
@@ -77,6 +83,31 @@ class GLRendererWithSkiaGPUBackend : public GLRenderer {
                    highp_threshold_min) {}
 };
 
+// Wrappers to differentiate renderers where the the output surface and viewport
+// have an externally determined size and offset.
+class GLRendererWithExpandedViewport : public GLRenderer {
+ public:
+  GLRendererWithExpandedViewport(RendererClient* client,
+                       OutputSurface* output_surface,
+                       ResourceProvider* resource_provider,
+                       int highp_threshold_min)
+      : GLRenderer(client,
+                   output_surface,
+                   resource_provider,
+                   highp_threshold_min) {}
+};
+
+class SoftwareRendererWithExpandedViewport : public SoftwareRenderer {
+ public:
+  SoftwareRendererWithExpandedViewport(RendererClient* client,
+                       OutputSurface* output_surface,
+                       ResourceProvider* resource_provider)
+      : SoftwareRenderer(client,
+                   output_surface,
+                   resource_provider) {}
+};
+
+
 template<>
 inline void RendererPixelTest<GLRenderer>::SetUp() {
   SetUpGLRenderer(false);
@@ -89,6 +120,11 @@ inline bool RendererPixelTest<GLRenderer>::UseSkiaGPUBackend() const {
 }
 
 template<>
+inline bool RendererPixelTest<GLRenderer>::ExpandedViewport() const {
+  return false;
+}
+
+template<>
 inline void RendererPixelTest<GLRendererWithSkiaGPUBackend>::SetUp() {
   SetUpGLRenderer(true);
   DCHECK(renderer()->CanUseSkiaGPUBackend());
@@ -100,6 +136,30 @@ RendererPixelTest<GLRendererWithSkiaGPUBackend>::UseSkiaGPUBackend() const {
   return true;
 }
 
+template <>
+inline bool RendererPixelTest<GLRendererWithSkiaGPUBackend>::ExpandedViewport()
+    const {
+  return false;
+}
+
+template<>
+inline void RendererPixelTest<GLRendererWithExpandedViewport>::SetUp() {
+  SetUpGLRenderer(false);
+  ForceExpandedViewport(gfx::Size(50, 50), gfx::Vector2d(10, 20));
+}
+
+template <>
+inline bool
+RendererPixelTest<GLRendererWithExpandedViewport>::UseSkiaGPUBackend() const {
+  return false;
+}
+
+template <>
+inline bool
+RendererPixelTest<GLRendererWithExpandedViewport>::ExpandedViewport() const {
+  return true;
+}
+
 template<>
 inline void RendererPixelTest<SoftwareRenderer>::SetUp() {
   SetUpSoftwareRenderer();
@@ -110,6 +170,29 @@ inline bool RendererPixelTest<SoftwareRenderer>::UseSkiaGPUBackend() const {
   return false;
 }
 
+template <>
+inline bool RendererPixelTest<SoftwareRenderer>::ExpandedViewport() const {
+  return false;
+}
+
+template<>
+inline void RendererPixelTest<SoftwareRendererWithExpandedViewport>::SetUp() {
+  SetUpSoftwareRenderer();
+  ForceExpandedViewport(gfx::Size(50, 50), gfx::Vector2d(10, 20));
+}
+
+template <>
+inline bool RendererPixelTest<
+    SoftwareRendererWithExpandedViewport>::UseSkiaGPUBackend() const {
+  return false;
+}
+
+template <>
+inline bool RendererPixelTest<
+    SoftwareRendererWithExpandedViewport>::ExpandedViewport() const {
+  return true;
+}
+
 typedef RendererPixelTest<GLRenderer> GLRendererPixelTest;
 typedef RendererPixelTest<GLRendererWithSkiaGPUBackend>
     GLRendererSkiaGPUBackendPixelTest;