| 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 #include <utility> |
| 9 | 10 |
| 10 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 12 #include "cc/blink/cc_blink_export.h" | 13 #include "cc/blink/cc_blink_export.h" |
| 13 #include "cc/layers/layer_client.h" | 14 #include "cc/layers/layer_client.h" |
| 14 #include "third_party/WebKit/public/platform/WebCString.h" | 15 #include "third_party/WebKit/public/platform/WebCString.h" |
| 15 #include "third_party/WebKit/public/platform/WebColor.h" | 16 #include "third_party/WebKit/public/platform/WebColor.h" |
| 16 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h" | 17 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h" |
| 17 #include "third_party/WebKit/public/platform/WebFloatPoint.h" | 18 #include "third_party/WebKit/public/platform/WebFloatPoint.h" |
| 18 #include "third_party/WebKit/public/platform/WebLayer.h" | 19 #include "third_party/WebKit/public/platform/WebLayer.h" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 virtual void setBackgroundFilters(const blink::WebFilterOperations& filters); | 96 virtual void setBackgroundFilters(const blink::WebFilterOperations& filters); |
| 96 virtual void setAnimationDelegate( | 97 virtual void setAnimationDelegate( |
| 97 blink::WebCompositorAnimationDelegate* delegate); | 98 blink::WebCompositorAnimationDelegate* delegate); |
| 98 virtual bool addAnimation(blink::WebCompositorAnimation* animation); | 99 virtual bool addAnimation(blink::WebCompositorAnimation* animation); |
| 99 virtual void removeAnimation(int animation_id); | 100 virtual void removeAnimation(int animation_id); |
| 100 virtual void removeAnimation(int animation_id, | 101 virtual void removeAnimation(int animation_id, |
| 101 blink::WebCompositorAnimation::TargetProperty); | 102 blink::WebCompositorAnimation::TargetProperty); |
| 102 virtual void pauseAnimation(int animation_id, double time_offset); | 103 virtual void pauseAnimation(int animation_id, double time_offset); |
| 103 virtual bool hasActiveAnimation(); | 104 virtual bool hasActiveAnimation(); |
| 104 virtual void setForceRenderSurface(bool force); | 105 virtual void setForceRenderSurface(bool force); |
| 106 // TODO(miletus): Remove the WebPoint version once blink side starts to |
| 107 // use the std:pair<double, double> version. |
| 108 virtual void setScrollPositionFloat(const std::pair<double, double>&); |
| 109 virtual std::pair<double, double> scrollPositionFloat() const; |
| 105 virtual void setScrollPosition(blink::WebPoint position); | 110 virtual void setScrollPosition(blink::WebPoint position); |
| 106 virtual blink::WebPoint scrollPosition() const; | 111 virtual blink::WebPoint scrollPosition() const; |
| 107 virtual void setScrollClipLayer(blink::WebLayer* clip_layer); | 112 virtual void setScrollClipLayer(blink::WebLayer* clip_layer); |
| 108 virtual bool scrollable() const; | 113 virtual bool scrollable() const; |
| 109 virtual void setUserScrollable(bool horizontal, bool vertical); | 114 virtual void setUserScrollable(bool horizontal, bool vertical); |
| 110 virtual bool userScrollableHorizontal() const; | 115 virtual bool userScrollableHorizontal() const; |
| 111 virtual bool userScrollableVertical() const; | 116 virtual bool userScrollableVertical() const; |
| 112 virtual void setHaveWheelEventHandlers(bool have_wheel_event_handlers); | 117 virtual void setHaveWheelEventHandlers(bool have_wheel_event_handlers); |
| 113 virtual bool haveWheelEventHandlers() const; | 118 virtual bool haveWheelEventHandlers() const; |
| 114 virtual void setHaveScrollEventHandlers(bool have_scroll_event_handlers); | 119 virtual void setHaveScrollEventHandlers(bool have_scroll_event_handlers); |
| (...skipping 28 matching lines...) Expand all Loading... |
| 143 | 148 |
| 144 private: | 149 private: |
| 145 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; | 150 scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; |
| 146 | 151 |
| 147 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); | 152 DISALLOW_COPY_AND_ASSIGN(WebLayerImpl); |
| 148 }; | 153 }; |
| 149 | 154 |
| 150 } // namespace cc_blink | 155 } // namespace cc_blink |
| 151 | 156 |
| 152 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ | 157 #endif // CC_BLINK_WEB_LAYER_IMPL_H_ |
| OLD | NEW |