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

Unified Diff: ui/ozone/platform/test/test_window_manager.cc

Issue 377973005: ozone: test: Convert to PlatformWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add dcheck Created 6 years, 5 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
« no previous file with comments | « ui/ozone/platform/test/test_window_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/test/test_window_manager.cc
diff --git a/ui/ozone/platform/test/file_surface_factory.cc b/ui/ozone/platform/test/test_window_manager.cc
similarity index 63%
rename from ui/ozone/platform/test/file_surface_factory.cc
rename to ui/ozone/platform/test/test_window_manager.cc
index ab1e67cbaad31323009c504365845ebbb98d86c0..7f79517aff6ae181a642cc8a466602b2a5a86f9f 100644
--- a/ui/ozone/platform/test/file_surface_factory.cc
+++ b/ui/ozone/platform/test/test_window_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/ozone/platform/test/file_surface_factory.h"
+#include "ui/ozone/platform/test/test_window_manager.h"
#include "base/bind.h"
#include "base/file_util.h"
@@ -63,33 +63,54 @@ class FileSurface : public SurfaceOzoneCanvas {
} // namespace
-FileSurfaceFactory::FileSurfaceFactory(const base::FilePath& dump_location)
+TestWindowManager::TestWindowManager(const base::FilePath& dump_location)
: location_(dump_location) {
- CHECK(!base::DirectoryExists(location_)) << "Location cannot be a directory ("
- << location_.value() << ")";
- CHECK(!base::PathExists(location_) || base::PathIsWritable(location_));
}
-FileSurfaceFactory::~FileSurfaceFactory() {
+TestWindowManager::~TestWindowManager() {
}
-SurfaceFactoryOzone::HardwareState FileSurfaceFactory::InitializeHardware() {
+void TestWindowManager::Initialize() {
+ if (!DirectoryExists(location_) && !base::CreateDirectory(location_) &&
+ location_ != base::FilePath("/dev/null"))
+ PLOG(FATAL) << "unable to create output directory";
+ if (!base::PathIsWritable(location_))
+ PLOG(FATAL) << "unable to write to output location";
+}
+
+int32_t TestWindowManager::AddWindow(TestWindow* window) {
+ return windows_.Add(window);
+}
+
+void TestWindowManager::RemoveWindow(int32_t window_id, TestWindow* window) {
+ DCHECK_EQ(window, windows_.Lookup(window_id));
+ windows_.Remove(window_id);
+}
+
+base::FilePath TestWindowManager::base_path() const {
+ return location_;
+}
+
+SurfaceFactoryOzone::HardwareState TestWindowManager::InitializeHardware() {
return INITIALIZED;
}
-void FileSurfaceFactory::ShutdownHardware() {
+void TestWindowManager::ShutdownHardware() {
}
-gfx::AcceleratedWidget FileSurfaceFactory::GetAcceleratedWidget() {
- return 1;
+gfx::AcceleratedWidget TestWindowManager::GetAcceleratedWidget() {
+ NOTREACHED();
+ return -1;
}
-scoped_ptr<SurfaceOzoneCanvas> FileSurfaceFactory::CreateCanvasForWidget(
- gfx::AcceleratedWidget w) {
- return make_scoped_ptr<SurfaceOzoneCanvas>(new FileSurface(location_));
+scoped_ptr<SurfaceOzoneCanvas> TestWindowManager::CreateCanvasForWidget(
+ gfx::AcceleratedWidget widget) {
+ TestWindow* window = windows_.Lookup(widget);
+ DCHECK(window);
+ return make_scoped_ptr<SurfaceOzoneCanvas>(new FileSurface(window->path()));
}
-bool FileSurfaceFactory::LoadEGLGLES2Bindings(
+bool TestWindowManager::LoadEGLGLES2Bindings(
AddGLLibraryCallback add_gl_library,
SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
return false;
« no previous file with comments | « ui/ozone/platform/test/test_window_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698