| 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 CC_BLINK_WEB_LAYER_IMPL_H_ | 5 #ifndef CC_BLINK_WEB_LAYER_IMPL_H_ |
| 6 #define CC_BLINK_WEB_LAYER_IMPL_H_ | 6 #define CC_BLINK_WEB_LAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "third_party/WebKit/public/platform/WebVector.h" | 24 #include "third_party/WebKit/public/platform/WebVector.h" |
| 25 #include "third_party/skia/include/utils/SkMatrix44.h" | 25 #include "third_party/skia/include/utils/SkMatrix44.h" |
| 26 | 26 |
| 27 namespace blink { | 27 namespace blink { |
| 28 class WebFilterOperations; | 28 class WebFilterOperations; |
| 29 class WebLayerClient; | 29 class WebLayerClient; |
| 30 struct WebFloatRect; | 30 struct WebFloatRect; |
| 31 } | 31 } |
| 32 | 32 |
| 33 namespace base { | 33 namespace base { |
| 34 namespace debug { | 34 namespace trace_event { |
| 35 class ConvertableToTraceFormat; | 35 class ConvertableToTraceFormat; |
| 36 } | 36 } |
| 37 |
| 38 // TODO(ssid): remove these aliases after the tracing clients are moved to the |
| 39 // new trace_event namespace. See crbug.com/451032. ETA: March 2015. |
| 40 namespace debug { |
| 41 using ::base::trace_event::ConvertableToTraceFormat; |
| 37 } | 42 } |
| 43 } // namespace base |
| 38 | 44 |
| 39 namespace cc { | 45 namespace cc { |
| 40 class Layer; | 46 class Layer; |
| 41 } | 47 } |
| 42 | 48 |
| 43 namespace cc_blink { | 49 namespace cc_blink { |
| 44 | 50 |
| 45 class WebToCCAnimationDelegateAdapter; | 51 class WebToCCAnimationDelegateAdapter; |
| 46 | 52 |
| 47 class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { | 53 class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 | 152 |
| 147 private: | 153 private: |
| 148 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; | 154 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; |
| 149 | 155 |
| 150 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); | 156 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); |
| 151 }; | 157 }; |
| 152 | 158 |
| 153 } // namespace cc_blink | 159 } // namespace cc_blink |
| 154 | 160 |
| 155 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ | 161 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ |
| OLD | NEW |