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

Unified Diff: ui/gfx/compositor/test/test_compositor_host_linux.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 8 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/gfx/compositor/test/test_compositor_host.h ('k') | ui/gfx/compositor/test/test_compositor_host_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/test/test_compositor_host_linux.cc
diff --git a/ui/gfx/compositor/test/test_compositor_host_linux.cc b/ui/gfx/compositor/test/test_compositor_host_linux.cc
deleted file mode 100644
index cf184f247a4ce66797842ff21e2d2ca1bcda791b..0000000000000000000000000000000000000000
--- a/ui/gfx/compositor/test/test_compositor_host_linux.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) 2012 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/gfx/compositor/test/test_compositor_host.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 "ui/base/x/x11_util.h"
-#include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/rect.h"
-
-#include <X11/Xlib.h>
-
-namespace ui {
-
-class TestCompositorHostLinux : public TestCompositorHost,
- public CompositorDelegate {
- public:
- TestCompositorHostLinux(const gfx::Rect& bounds);
- virtual ~TestCompositorHostLinux();
-
- private:
- // Overridden from TestCompositorHost:
- virtual void Show() OVERRIDE;
- virtual ui::Compositor* GetCompositor() OVERRIDE;
-
- // Overridden from CompositorDelegate:
- virtual void ScheduleDraw() OVERRIDE;
-
- void Draw();
-
- gfx::Rect bounds_;
-
- scoped_ptr<ui::Compositor> compositor_;
-
- XID window_;
-
- base::WeakPtrFactory<TestCompositorHostLinux> method_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(TestCompositorHostLinux);
-};
-
-TestCompositorHostLinux::TestCompositorHostLinux(const gfx::Rect& bounds)
- : bounds_(bounds),
- ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
-}
-
-TestCompositorHostLinux::~TestCompositorHostLinux() {
-}
-
-void TestCompositorHostLinux::Show() {
- Display* display = base::MessagePumpForUI::GetDefaultXDisplay();
- 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(this, window_, bounds_.size()));
-}
-
-ui::Compositor* TestCompositorHostLinux::GetCompositor() {
- return compositor_.get();
-}
-
-void TestCompositorHostLinux::ScheduleDraw() {
- if (!method_factory_.HasWeakPtrs()) {
- MessageLoopForUI::current()->PostTask(
- FROM_HERE,
- base::Bind(&TestCompositorHostLinux::Draw,
- method_factory_.GetWeakPtr()));
- }
-}
-
-void TestCompositorHostLinux::Draw() {
- if (compositor_.get())
- compositor_->Draw(false);
-}
-
-// static
-TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
- return new TestCompositorHostLinux(bounds);
-}
-
-} // namespace ui
« no previous file with comments | « ui/gfx/compositor/test/test_compositor_host.h ('k') | ui/gfx/compositor/test/test_compositor_host_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698