Chromium Code Reviews| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 96 virtual void setBackgroundFilters(const blink::WebFilterOperations& filters); | 96 virtual void setBackgroundFilters(const blink::WebFilterOperations& filters); |
| 97 virtual void setAnimationDelegate( | 97 virtual void setAnimationDelegate( |
| 98 blink::WebCompositorAnimationDelegate* delegate); | 98 blink::WebCompositorAnimationDelegate* delegate); |
| 99 virtual bool addAnimation(blink::WebCompositorAnimation* animation); | 99 virtual bool addAnimation(blink::WebCompositorAnimation* animation); |
| 100 virtual void removeAnimation(int animation_id); | 100 virtual void removeAnimation(int animation_id); |
| 101 virtual void removeAnimation(int animation_id, | 101 virtual void removeAnimation(int animation_id, |
| 102 blink::WebCompositorAnimation::TargetProperty); | 102 blink::WebCompositorAnimation::TargetProperty); |
| 103 virtual void pauseAnimation(int animation_id, double time_offset); | 103 virtual void pauseAnimation(int animation_id, double time_offset); |
| 104 virtual bool hasActiveAnimation(); | 104 virtual bool hasActiveAnimation(); |
| 105 virtual void setForceRenderSurface(bool force); | 105 virtual void setForceRenderSurface(bool force); |
| 106 // TODO(miletus): Add the WebDoublePoint version to WebLayer and then remove | |
| 107 // the WebPoint version from WebLayer and WebLayerImpl. | |
| 108 virtual void setScrollPosition(blink::WebPoint position); | |
| 109 virtual blink::WebPoint scrollPosition() const; | |
| 110 virtual void setScrollPositionDouble(blink::WebDoublePoint position); | 106 virtual void setScrollPositionDouble(blink::WebDoublePoint position); |
| 111 virtual blink::WebDoublePoint scrollPositionDouble() const; | 107 virtual blink::WebDoublePoint scrollPositionDouble() const; |
| 112 virtual void setScrollClipLayer(blink::WebLayer* clip_layer); | 108 virtual void setScrollClipLayer(blink::WebLayer* clip_layer); |
| 113 virtual bool scrollable() const; | 109 virtual bool scrollable() const; |
| 114 virtual void setUserScrollable(bool horizontal, bool vertical); | 110 virtual void setUserScrollable(bool horizontal, bool vertical); |
| 115 virtual bool userScrollableHorizontal() const; | 111 virtual bool userScrollableHorizontal() const; |
| 116 virtual bool userScrollableVertical() const; | 112 virtual bool userScrollableVertical() const; |
| 117 virtual void setHaveWheelEventHandlers(bool have_wheel_event_handlers); | 113 virtual void setHaveWheelEventHandlers(bool have_wheel_event_handlers); |
| 118 virtual bool haveWheelEventHandlers() const; | 114 virtual bool haveWheelEventHandlers() const; |
| 119 virtual void setHaveScrollEventHandlers(bool have_scroll_event_handlers); | 115 virtual void setHaveScrollEventHandlers(bool have_scroll_event_handlers); |
| 120 virtual bool haveScrollEventHandlers() const; | 116 virtual bool haveScrollEventHandlers() const; |
| 121 virtual void setShouldScrollOnMainThread(bool scroll_on_main); | 117 virtual void setShouldScrollOnMainThread(bool scroll_on_main); |
| 122 virtual bool shouldScrollOnMainThread() const; | 118 virtual bool shouldScrollOnMainThread() const; |
| 123 virtual void setNonFastScrollableRegion( | 119 virtual void setNonFastScrollableRegion( |
| 124 const blink::WebVector<blink::WebRect>& region); | 120 const blink::WebVector<blink::WebRect>& region); |
| 125 virtual blink::WebVector<blink::WebRect> nonFastScrollableRegion() const; | 121 virtual blink::WebVector<blink::WebRect> nonFastScrollableRegion() const; |
| 126 virtual void setTouchEventHandlerRegion( | 122 virtual void setTouchEventHandlerRegion( |
| 127 const blink::WebVector<blink::WebRect>& region); | 123 const blink::WebVector<blink::WebRect>& region); |
| 128 virtual blink::WebVector<blink::WebRect> touchEventHandlerRegion() const; | 124 virtual blink::WebVector<blink::WebRect> touchEventHandlerRegion() const; |
| 129 virtual void setIsContainerForFixedPositionLayers(bool is_container); | 125 virtual void setIsContainerForFixedPositionLayers(bool is_container); |
| 130 virtual bool isContainerForFixedPositionLayers() const; | 126 virtual bool isContainerForFixedPositionLayers() const; |
| 131 virtual void setPositionConstraint( | 127 virtual void setPositionConstraint( |
| 132 const blink::WebLayerPositionConstraint& constraint); | 128 const blink::WebLayerPositionConstraint& constraint); |
| 133 virtual blink::WebLayerPositionConstraint positionConstraint() const; | 129 virtual blink::WebLayerPositionConstraint positionConstraint() const; |
| 134 virtual void setScrollClient(blink::WebLayerScrollClient* client); | 130 virtual void setScrollClient(blink::WebLayerScrollClient* client); |
| 135 virtual bool isOrphan() const; | 131 virtual bool isOrphan() const; |
| 136 virtual void setWebLayerClient(blink::WebLayerClient* client); | 132 virtual void setWebLayerClient(blink::WebLayerClient* client); |
| 137 | 133 |
| 138 // LayerClient implementation. | 134 // LayerClient implementation. |
| 139 virtual scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() | 135 scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() override; |
|
danakj
2014/10/09 20:11:17
i think clang plugin still complains about virtual
Yufeng Shen (Slow to review)
2014/10/09 20:13:02
Yeah, presubmit complains about it so I thought I
danakj
2014/10/09 20:14:11
Do you know which presubmit check it is? (can you
jamesr
2014/10/09 20:14:18
Presubmit is wrong until the clang plugin actually
| |
| 140 override; | |
| 141 | 136 |
| 142 virtual void setScrollParent(blink::WebLayer* parent); | 137 virtual void setScrollParent(blink::WebLayer* parent); |
| 143 virtual void setClipParent(blink::WebLayer* parent); | 138 virtual void setClipParent(blink::WebLayer* parent); |
| 144 | 139 |
| 145 protected: | 140 protected: |
| 146 scoped_refptr<cc::Layer> layer_; | 141 scoped_refptr<cc::Layer> layer_; |
| 147 blink::WebLayerClient* web_layer_client_; | 142 blink::WebLayerClient* web_layer_client_; |
| 148 | 143 |
| 149 private: | 144 private: |
| 150 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; | 145 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; |
| 151 | 146 |
| 152 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); | 147 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); |
| 153 }; | 148 }; |
| 154 | 149 |
| 155 } // namespace cc_blink | 150 } // namespace cc_blink |
| 156 | 151 |
| 157 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ | 152 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ |
| OLD | NEW |