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

Unified Diff: ui/compositor/test/test_compositor_host_x11.cc

Issue 851853002: It is time. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Trying to reup because the last upload failed. Created 5 years, 11 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/compositor/test/test_compositor_host_win.cc ('k') | ui/compositor/test/test_layer_animation_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/test_compositor_host_x11.cc
diff --git a/ui/compositor/test/test_compositor_host_x11.cc b/ui/compositor/test/test_compositor_host_x11.cc
deleted file mode 100644
index d881d154d243cc1c600072cadcf13b0d00f35c0e..0000000000000000000000000000000000000000
--- a/ui/compositor/test/test_compositor_host_x11.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/compositor/test/test_compositor_host.h"
-
-#include <X11/Xlib.h>
-
-#include "base/basictypes.h"
-#include "base/bind.h"
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
-#include "base/thread_task_runner_handle.h"
-#include "ui/compositor/compositor.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/x/x11_types.h"
-
-namespace ui {
-
-class TestCompositorHostX11 : public TestCompositorHost {
- public:
- TestCompositorHostX11(const gfx::Rect& bounds,
- ui::ContextFactory* context_factory);
- virtual ~TestCompositorHostX11();
-
- private:
- // Overridden from TestCompositorHost:
- virtual void Show() override;
- virtual ui::Compositor* GetCompositor() override;
-
- void Draw();
-
- gfx::Rect bounds_;
-
- ui::ContextFactory* context_factory_;
-
- scoped_ptr<ui::Compositor> compositor_;
-
- XID window_;
-
- DISALLOW_COPY_AND_ASSIGN(TestCompositorHostX11);
-};
-
-TestCompositorHostX11::TestCompositorHostX11(
- const gfx::Rect& bounds,
- ui::ContextFactory* context_factory)
- : bounds_(bounds),
- context_factory_(context_factory) {
-}
-
-TestCompositorHostX11::~TestCompositorHostX11() {
-}
-
-void TestCompositorHostX11::Show() {
- XDisplay* display = gfx::GetXDisplay();
- XSetWindowAttributes swa;
- swa.event_mask = StructureNotifyMask | ExposureMask;
- swa.override_redirect = True;
- window_ = XCreateWindow(
- display,
- RootWindow(display, DefaultScreen(display)), // parent
- bounds_.x(), bounds_.y(), bounds_.width(), bounds_.height(),
- 0, // border width
- CopyFromParent, // depth
- InputOutput,
- CopyFromParent, // visual
- CWEventMask | CWOverrideRedirect, &swa);
- XMapWindow(display, window_);
-
- while (1) {
- XEvent event;
- XNextEvent(display, &event);
- if (event.type == MapNotify && event.xmap.window == window_)
- break;
- }
- compositor_.reset(new ui::Compositor(window_,
- context_factory_,
- base::ThreadTaskRunnerHandle::Get()));
- compositor_->SetScaleAndSize(1.0f, bounds_.size());
-}
-
-ui::Compositor* TestCompositorHostX11::GetCompositor() {
- return compositor_.get();
-}
-
-void TestCompositorHostX11::Draw() {
- if (compositor_.get())
- compositor_->Draw();
-}
-
-// static
-TestCompositorHost* TestCompositorHost::Create(
- const gfx::Rect& bounds,
- ui::ContextFactory* context_factory) {
- return new TestCompositorHostX11(bounds, context_factory);
-}
-
-} // namespace ui
« no previous file with comments | « ui/compositor/test/test_compositor_host_win.cc ('k') | ui/compositor/test/test_layer_animation_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698