| Index: Source/core/platform/mac/ScrollbarThemeMacNonOverlayAPI.h
|
| diff --git a/Source/core/animation/Animation.h b/Source/core/platform/mac/ScrollbarThemeMacNonOverlayAPI.h
|
| similarity index 62%
|
| copy from Source/core/animation/Animation.h
|
| copy to Source/core/platform/mac/ScrollbarThemeMacNonOverlayAPI.h
|
| index 7f5d7a897f3a0cb2aad36a7c1f8aa2b9cae2a93e..a2345c7652181ab28ce9ab2be449f85257baca5a 100644
|
| --- a/Source/core/animation/Animation.h
|
| +++ b/Source/core/platform/mac/ScrollbarThemeMacNonOverlayAPI.h
|
| @@ -28,44 +28,34 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef Animation_h
|
| -#define Animation_h
|
| +#ifndef ScrollbarThemeMacNonOverlayAPI_h
|
| +#define ScrollbarThemeMacNonOverlayAPI_h
|
|
|
| -#include "core/animation/AnimationEffect.h"
|
| -#include "core/animation/TimedItem.h"
|
| -#include "wtf/RefPtr.h"
|
| +#include "core/platform/mac/ScrollbarThemeMac.h"
|
|
|
| namespace WebCore {
|
|
|
| -class Element;
|
| -
|
| -class Animation FINAL : public TimedItem {
|
| -
|
| +class ScrollbarThemeMacNonOverlayAPI : public ScrollbarThemeMacCommon {
|
| public:
|
| - static PassRefPtr<Animation> create(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&);
|
| + virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar);
|
| + virtual bool usesOverlayScrollbars() const { return false; }
|
| + virtual ScrollbarButtonsPlacement buttonsPlacement() const;
|
|
|
| - const AnimationEffect::CompositableValueMap* compositableValues() const
|
| - {
|
| - ASSERT(m_compositableValues);
|
| - return m_compositableValues.get();
|
| - }
|
| + virtual bool paint(ScrollbarThemeClient*, GraphicsContext*, const IntRect& damageRect);
|
|
|
| protected:
|
| - virtual void applyEffects(bool previouslyInEffect);
|
| - virtual void clearEffects();
|
| - virtual void updateChildrenAndEffects(bool) const OVERRIDE FINAL;
|
| - virtual void willDetach() OVERRIDE FINAL;
|
| + virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false);
|
| + virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false);
|
| + virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false);
|
|
|
| -private:
|
| - Animation(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&);
|
| + virtual void updateButtonPlacement();
|
|
|
| - RefPtr<Element> m_target;
|
| - RefPtr<AnimationEffect> m_effect;
|
| + virtual bool hasButtons(ScrollbarThemeClient*);
|
| + virtual bool hasThumb(ScrollbarThemeClient*);
|
|
|
| - bool m_activeInAnimationStack;
|
| - OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues;
|
| + virtual int minimumThumbLength(ScrollbarThemeClient*);
|
| };
|
|
|
| -} // namespace WebCore
|
| +}
|
|
|
| #endif
|
|
|