summaryrefslogtreecommitdiffstats
path: root/webkit/compositor_bindings
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 05:25:05 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-19 05:25:05 +0000
commit501a770c98cce5fadde5f11d950083ab2afe16f3 (patch)
tree7233db544adee4441b683f0e18210076a85da33a /webkit/compositor_bindings
parentc5e479f2ea076dbcf1826c83875c9dcf171eee15 (diff)
downloadchromium_src-501a770c98cce5fadde5f11d950083ab2afe16f3.zip
chromium_src-501a770c98cce5fadde5f11d950083ab2afe16f3.tar.gz
chromium_src-501a770c98cce5fadde5f11d950083ab2afe16f3.tar.bz2
cc: Cleaning up LayerTreeHost tests.
While writing unit tests for lost contents I got fed up with the crazy entangled mess that is layer_tree_host_unittests. It's long overdue we clean this file up to improve code reuse, and split it apart. - Removes the CompositorFakeWebGraphicsContext3D - Removes the CompositorFakeWebGraphicsContext3DWithTextureTracking - Use FakeWebGraphicsContext3D in place of the above two classes. - Move a single animation unit test to layer_tree_host_unittest_animation. This is to demonstrate how I intend to split up the file. I'll move all the animation related tests to _animation.cc, and group others by their kinds. Added a setupTree() method to the base class for LayerTreeHostTests that allows for easily constructing a base class test case that multiple tests can be constructed around without copy-pasta. R=enne,jamesr Review URL: https://codereview.chromium.org/11643003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings')
-rw-r--r--webkit/compositor_bindings/test/web_layer_tree_view_test_common.h3
-rw-r--r--webkit/compositor_bindings/web_layer_tree_view_unittest.cc1
-rw-r--r--webkit/compositor_bindings/web_layer_unittest.cc1
3 files changed, 1 insertions, 4 deletions
diff --git a/webkit/compositor_bindings/test/web_layer_tree_view_test_common.h b/webkit/compositor_bindings/test/web_layer_tree_view_test_common.h
index b000155..827040a 100644
--- a/webkit/compositor_bindings/test/web_layer_tree_view_test_common.h
+++ b/webkit/compositor_bindings/test/web_layer_tree_view_test_common.h
@@ -5,7 +5,6 @@
#ifndef WebLayerTreeViewTestCommon_h
#define WebLayerTreeViewTestCommon_h
-#include "cc/test/compositor_fake_web_graphics_context_3d.h"
#include "cc/test/fake_output_surface.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
@@ -23,7 +22,7 @@ public:
virtual cc::OutputSurface* createOutputSurface() OVERRIDE
{
- return cc::FakeOutputSurface::Create3d(cc::CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).release();
+ return cc::createFakeOutputSurface().release();
}
virtual void didRecreateOutputSurface(bool) OVERRIDE { }
diff --git a/webkit/compositor_bindings/web_layer_tree_view_unittest.cc b/webkit/compositor_bindings/web_layer_tree_view_unittest.cc
index af8599b..dc6fd9d 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_unittest.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_unittest.cc
@@ -7,7 +7,6 @@
#include "base/threading/thread.h"
#include "cc/proxy.h"
#include "cc/thread_impl.h"
-#include "cc/test/compositor_fake_web_graphics_context_3d.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
diff --git a/webkit/compositor_bindings/web_layer_unittest.cc b/webkit/compositor_bindings/web_layer_unittest.cc
index b323392..b058c02 100644
--- a/webkit/compositor_bindings/web_layer_unittest.cc
+++ b/webkit/compositor_bindings/web_layer_unittest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "cc/test/compositor_fake_web_graphics_context_3d.h"
#include "cc/thread.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h"