Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(660)

Unified Diff: ui/gfx/compositor/test_suite.cc

Issue 8222028: Use WebKit compositor in ui::Layer (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase,fixes Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/gfx/compositor/layer.cc ('K') | « ui/gfx/compositor/test_suite.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/test_suite.cc
diff --git a/ui/gfx/compositor/test_suite.cc b/ui/gfx/compositor/test_suite.cc
index f26cd314584e5a4d3e49a493d1364e3992c2d9d8..065f8fb08b8268162660e4eb21f986e35928477d 100644
--- a/ui/gfx/compositor/test_suite.cc
+++ b/ui/gfx/compositor/test_suite.cc
@@ -4,14 +4,23 @@
#include "ui/gfx/compositor/test_suite.h"
+#include "base/message_loop.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/gfx/gfx_paths.h"
#include "ui/gfx/gl/gl_implementation.h"
+#include "webkit/glue/webkitplatformsupport_impl.h"
+
+#if defined(USE_WEBKIT_COMPOSITOR)
+#include "ui/gfx/compositor/compositor_cc.h"
+#endif
CompositorTestSuite::CompositorTestSuite(int argc, char** argv)
: TestSuite(argc, argv) {}
+CompositorTestSuite::~CompositorTestSuite() {}
+
void CompositorTestSuite::Initialize() {
#if defined(OS_LINUX)
gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
@@ -24,9 +33,17 @@ void CompositorTestSuite::Initialize() {
// Force unittests to run using en-US so if we test against string
// output, it'll pass regardless of the system language.
ui::ResourceBundle::InitSharedInstance("en-US");
+
+ message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
+ webkit_support_.reset(new webkit_glue::WebKitPlatformSupportImpl);
+ WebKit::initialize(webkit_support_.get());
}
void CompositorTestSuite::Shutdown() {
+ WebKit::shutdown();
+ webkit_support_.reset();
+ message_loop_.reset();
+
ui::ResourceBundle::CleanupSharedInstance();
base::TestSuite::Shutdown();
« ui/gfx/compositor/layer.cc ('K') | « ui/gfx/compositor/test_suite.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698