summaryrefslogtreecommitdiffstats
path: root/views/view_unittest.cc
diff options
context:
space:
mode:
authorvollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-18 04:29:18 +0000
committervollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-18 04:29:18 +0000
commitfcb98b71dca7f7a940f8aa0aa66bca76ac88a38b (patch)
tree52bfc11cdee9811ae79f611698ab7f30ee6c9645 /views/view_unittest.cc
parentc85a9a1758402280fb82fd81a66f5d75c825d79f (diff)
downloadchromium_src-fcb98b71dca7f7a940f8aa0aa66bca76ac88a38b.zip
chromium_src-fcb98b71dca7f7a940f8aa0aa66bca76ac88a38b.tar.gz
chromium_src-fcb98b71dca7f7a940f8aa0aa66bca76ac88a38b.tar.bz2
Adds a couple of pixel-based compositor unittests. One to test that opacity is handled correctly, and one to check that MoveToFront and MoveAbove really do change the compositor output as expected.
Noteworthy changes are in layer_unittest.cc. Most of the changes below are due to moving compositor testing code into ui/gfx/compositor/test. Depends on http://codereview.chromium.org/8463024/ and http://codereview.chromium.org/8590019/ BUG=None TEST=compositor_unittests Review URL: http://codereview.chromium.org/8533019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_unittest.cc')
-rw-r--r--views/view_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index d0ed95f..140a03fa 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -17,8 +17,8 @@
#include "ui/gfx/compositor/compositor.h"
#include "ui/gfx/compositor/layer.h"
#include "ui/gfx/compositor/layer_animator.h"
-#include "ui/gfx/compositor/test_compositor.h"
-#include "ui/gfx/compositor/test_texture.h"
+#include "ui/gfx/compositor/test/test_compositor.h"
+#include "ui/gfx/compositor/test/test_texture.h"
#include "ui/gfx/path.h"
#include "ui/gfx/transform.h"
#include "ui/views/test/views_test_base.h"