| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef SKY_VIEWER_COMPOSITOR_LAYER_H_ | 5 #ifndef SKY_VIEWER_COMPOSITOR_LAYER_H_ |
| 6 #define SKY_VIEWER_COMPOSITOR_LAYER_H_ | 6 #define SKY_VIEWER_COMPOSITOR_LAYER_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "mojo/gpu/gl_texture.h" | 9 #include "mojo/gpu/gl_texture.h" |
| 10 #include "services/sky/compositor/layer_client.h" |
| 11 #include "services/sky/compositor/rasterizer.h" |
| 10 #include "skia/ext/refptr.h" | 12 #include "skia/ext/refptr.h" |
| 11 #include "sky/viewer/compositor/layer_client.h" | |
| 12 #include "sky/viewer/compositor/rasterizer.h" | |
| 13 #include "third_party/skia/include/core/SkPicture.h" | 13 #include "third_party/skia/include/core/SkPicture.h" |
| 14 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" |
| 15 | 15 |
| 16 namespace sky { | 16 namespace sky { |
| 17 | 17 |
| 18 class LayerHost; | 18 class LayerHost; |
| 19 | 19 |
| 20 class Layer : public base::RefCounted<Layer> { | 20 class Layer : public base::RefCounted<Layer> { |
| 21 public: | 21 public: |
| 22 explicit Layer(LayerClient* client); | 22 explicit Layer(LayerClient* client); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 42 gfx::Size size_; | 42 gfx::Size size_; |
| 43 scoped_ptr<mojo::GLTexture> texture_; | 43 scoped_ptr<mojo::GLTexture> texture_; |
| 44 scoped_ptr<Rasterizer> rasterizer_; | 44 scoped_ptr<Rasterizer> rasterizer_; |
| 45 | 45 |
| 46 DISALLOW_COPY_AND_ASSIGN(Layer); | 46 DISALLOW_COPY_AND_ASSIGN(Layer); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 } // namespace sky | 49 } // namespace sky |
| 50 | 50 |
| 51 #endif // SKY_VIEWER_COMPOSITOR_LAYER_H_ | 51 #endif // SKY_VIEWER_COMPOSITOR_LAYER_H_ |
| OLD | NEW |