| 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 #include "WebLayerImpl.h" | 8 // FIXME: WebContentLayer should forward declare this |
| 9 namespace WebKit { |
| 10 class WebLayer; |
| 11 } |
| 12 |
| 9 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 10 #include "cc/content_layer_client.h" | 14 #include "cc/content_layer_client.h" |
| 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h" |
| 16 #include "web_layer_impl.h" |
| 12 | 17 |
| 13 namespace cc { | 18 namespace cc { |
| 14 class IntRect; | 19 class IntRect; |
| 15 class FloatRect; | 20 class FloatRect; |
| 16 } | 21 } |
| 17 | 22 |
| 18 namespace WebKit { | 23 namespace WebKit { |
| 19 class WebContentLayerClient; | 24 class WebContentLayerClient; |
| 20 | 25 |
| 21 class WebContentLayerImpl : public WebContentLayer, | 26 class WebContentLayerImpl : public WebContentLayer, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 38 virtual void paintContents(SkCanvas*, const cc::IntRect& clip, cc::FloatRect
& opaque) OVERRIDE; | 43 virtual void paintContents(SkCanvas*, const cc::IntRect& clip, cc::FloatRect
& opaque) OVERRIDE; |
| 39 | 44 |
| 40 scoped_ptr<WebLayerImpl> m_layer; | 45 scoped_ptr<WebLayerImpl> m_layer; |
| 41 WebContentLayerClient* m_client; | 46 WebContentLayerClient* m_client; |
| 42 bool m_drawsContent; | 47 bool m_drawsContent; |
| 43 }; | 48 }; |
| 44 | 49 |
| 45 } // namespace WebKit | 50 } // namespace WebKit |
| 46 | 51 |
| 47 #endif // WebContentLayerImpl_h | 52 #endif // WebContentLayerImpl_h |
| OLD | NEW |