| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/i18n/icu_util.h" | 8 #include "base/i18n/icu_util.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "third_party/khronos/GLES2/gl2ext.h" | 35 #include "third_party/khronos/GLES2/gl2ext.h" |
| 36 | 36 |
| 37 #if defined(USE_X11) | 37 #if defined(USE_X11) |
| 38 #include "base/message_loop/message_pump_x11.h" | 38 #include "base/message_loop/message_pump_x11.h" |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 using base::TimeTicks; | 41 using base::TimeTicks; |
| 42 using ui::Compositor; | 42 using ui::Compositor; |
| 43 using ui::Layer; | 43 using ui::Layer; |
| 44 using ui::LayerDelegate; | 44 using ui::LayerDelegate; |
| 45 using blink::WebGraphicsContext3D; | |
| 46 | 45 |
| 47 namespace { | 46 namespace { |
| 48 | 47 |
| 49 class ColoredLayer : public Layer, public LayerDelegate { | 48 class ColoredLayer : public Layer, public LayerDelegate { |
| 50 public: | 49 public: |
| 51 explicit ColoredLayer(SkColor color) | 50 explicit ColoredLayer(SkColor color) |
| 52 : Layer(ui::LAYER_TEXTURED), | 51 : Layer(ui::LAYER_TEXTURED), |
| 53 color_(color), | 52 color_(color), |
| 54 draw_(true) { | 53 draw_(true) { |
| 55 set_delegate(this); | 54 set_delegate(this); |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 ui::PrintLayerHierarchy(root_window->window()->layer(), gfx::Point(100, 100)); | 351 ui::PrintLayerHierarchy(root_window->window()->layer(), gfx::Point(100, 100)); |
| 353 #endif | 352 #endif |
| 354 | 353 |
| 355 root_window->host()->Show(); | 354 root_window->host()->Show(); |
| 356 base::MessageLoopForUI::current()->Run(); | 355 base::MessageLoopForUI::current()->Run(); |
| 357 focus_client.reset(); | 356 focus_client.reset(); |
| 358 root_window.reset(); | 357 root_window.reset(); |
| 359 | 358 |
| 360 return 0; | 359 return 0; |
| 361 } | 360 } |
| OLD | NEW |