| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 WebContentLayerImpl_h | 5 #ifndef WebContentLayerImpl_h |
| 6 #define WebContentLayerImpl_h | 6 #define WebContentLayerImpl_h |
| 7 | 7 |
| 8 // FIXME: WebContentLayer should forward declare this | |
| 9 namespace WebKit { | |
| 10 class WebLayer; | |
| 11 } | |
| 12 | |
| 13 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 14 #include "cc/content_layer_client.h" | 9 #include "cc/content_layer_client.h" |
| 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h" | 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h" |
| 16 #include "web_layer_impl.h" | 11 #include "web_layer_impl.h" |
| 17 | 12 |
| 18 namespace cc { | 13 namespace cc { |
| 19 class IntRect; | 14 class IntRect; |
| 20 class FloatRect; | 15 class FloatRect; |
| 21 } | 16 } |
| 22 | 17 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 44 virtual void paintContents(SkCanvas*, const gfx::Rect& clip, gfx::RectF& opa
que) OVERRIDE; | 39 virtual void paintContents(SkCanvas*, const gfx::Rect& clip, gfx::RectF& opa
que) OVERRIDE; |
| 45 | 40 |
| 46 scoped_ptr<WebLayerImpl> m_layer; | 41 scoped_ptr<WebLayerImpl> m_layer; |
| 47 WebContentLayerClient* m_client; | 42 WebContentLayerClient* m_client; |
| 48 bool m_drawsContent; | 43 bool m_drawsContent; |
| 49 }; | 44 }; |
| 50 | 45 |
| 51 } // namespace WebKit | 46 } // namespace WebKit |
| 52 | 47 |
| 53 #endif // WebContentLayerImpl_h | 48 #endif // WebContentLayerImpl_h |
| OLD | NEW |