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 11 matching lines...) Expand all Loading... | |
22 #include "third_party/WebKit/public/platform/WebSize.h" | 22 #include "third_party/WebKit/public/platform/WebSize.h" |
23 #include "third_party/WebKit/public/platform/WebString.h" | 23 #include "third_party/WebKit/public/platform/WebString.h" |
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 | |
Primiano Tucci (use gerrit)
2015/02/03 10:42:36
Nit: you accidentally ate this blank line.
ssid
2015/02/03 15:08:07
Done.
| |
33 namespace base { | 32 namespace base { |
34 namespace debug { | 33 namespace trace_event { |
35 class ConvertableToTraceFormat; | 34 class ConvertableToTraceFormat; |
36 } | 35 } |
36 | |
37 // This is added temporarily. Once the renaming of namespace usages | |
38 // accross all folders are done, this will be removed. | |
39 // TODO(ssid): crrev.com/837303004 | |
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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
143 | 149 |
144 private: | 150 private: |
145 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; | 151 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; |
146 | 152 |
147 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); | 153 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); |
148 }; | 154 }; |
149 | 155 |
150 } // namespace cc_blink | 156 } // namespace cc_blink |
151 | 157 |
152 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ | 158 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ |
OLD | NEW |