| 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 16 matching lines...) Expand all Loading... |
| 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 trace_event { | 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; | |
| 42 } | 37 } |
| 43 } // namespace base | |
| 44 | 38 |
| 45 namespace cc { | 39 namespace cc { |
| 46 class Layer; | 40 class Layer; |
| 47 } | 41 } |
| 48 | 42 |
| 49 namespace cc_blink { | 43 namespace cc_blink { |
| 50 | 44 |
| 51 class WebToCCAnimationDelegateAdapter; | 45 class WebToCCAnimationDelegateAdapter; |
| 52 | 46 |
| 53 class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { | 47 class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 virtual void setIsContainerForFixedPositionLayers(bool is_container); | 128 virtual void setIsContainerForFixedPositionLayers(bool is_container); |
| 135 virtual bool isContainerForFixedPositionLayers() const; | 129 virtual bool isContainerForFixedPositionLayers() const; |
| 136 virtual void setPositionConstraint( | 130 virtual void setPositionConstraint( |
| 137 const blink::WebLayerPositionConstraint& constraint); | 131 const blink::WebLayerPositionConstraint& constraint); |
| 138 virtual blink::WebLayerPositionConstraint positionConstraint() const; | 132 virtual blink::WebLayerPositionConstraint positionConstraint() const; |
| 139 virtual void setScrollClient(blink::WebLayerScrollClient* client); | 133 virtual void setScrollClient(blink::WebLayerScrollClient* client); |
| 140 virtual bool isOrphan() const; | 134 virtual bool isOrphan() const; |
| 141 virtual void setWebLayerClient(blink::WebLayerClient* client); | 135 virtual void setWebLayerClient(blink::WebLayerClient* client); |
| 142 | 136 |
| 143 // LayerClient implementation. | 137 // LayerClient implementation. |
| 144 scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() override; | 138 scoped_refptr<base::trace_event::ConvertableToTraceFormat> TakeDebugInfo() |
| 139 override; |
| 145 | 140 |
| 146 virtual void setScrollParent(blink::WebLayer* parent); | 141 virtual void setScrollParent(blink::WebLayer* parent); |
| 147 virtual void setClipParent(blink::WebLayer* parent); | 142 virtual void setClipParent(blink::WebLayer* parent); |
| 148 | 143 |
| 149 protected: | 144 protected: |
| 150 scoped_refptr<cc::Layer> layer_; | 145 scoped_refptr<cc::Layer> layer_; |
| 151 blink::WebLayerClient* web_layer_client_; | 146 blink::WebLayerClient* web_layer_client_; |
| 152 | 147 |
| 153 private: | 148 private: |
| 154 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; | 149 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; |
| 155 | 150 |
| 156 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); | 151 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); |
| 157 }; | 152 }; |
| 158 | 153 |
| 159 } // namespace cc_blink | 154 } // namespace cc_blink |
| 160 | 155 |
| 161 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ | 156 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ |
| OLD | NEW |