Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Side by Side Diff: Source/platform/scroll/ScrollbarThemeMacCommon.h

Issue 1245323002: Pass scroll bar placement as an enum instead of std::string (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix the headers to pass depchecks Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 20 matching lines...) Expand all
31 31
32 class SkCanvas; 32 class SkCanvas;
33 33
34 namespace blink { 34 namespace blink {
35 35
36 class Pattern; 36 class Pattern;
37 37
38 class PLATFORM_EXPORT ScrollbarThemeMacCommon : public ScrollbarTheme { 38 class PLATFORM_EXPORT ScrollbarThemeMacCommon : public ScrollbarTheme {
39 public: 39 public:
40 ~ScrollbarThemeMacCommon() override; 40 ~ScrollbarThemeMacCommon() override;
41
jochen (gone - plz use gerrit) 2015/07/22 09:52:49 nit. don't delete that line
Greg K 2015/07/22 19:41:55 Done.
42 void registerScrollbar(ScrollbarThemeClient*) override; 41 void registerScrollbar(ScrollbarThemeClient*) override;
43 void unregisterScrollbar(ScrollbarThemeClient*) override; 42 void unregisterScrollbar(ScrollbarThemeClient*) override;
44 void preferencesChanged(float initialButtonDelay, float autoscrollButtonDela y, NSScrollerStyle preferredScrollerStyle, bool redraw, bool scrollAnimationEnab led, const std::string& buttonPlacement); 43 void preferencesChanged(float initialButtonDelay, float autoscrollButtonDela y, NSScrollerStyle preferredScrollerStyle, bool redraw, bool scrollAnimationEnab led, ScrollbarButtonsPlacement buttonPlacement);
jochen (gone - plz use gerrit) 2015/07/22 09:52:49 same here (and everywhere), drop buttonPlacement
Greg K 2015/07/22 19:41:55 Done.
45 44
46 bool supportsControlTints() const override { return true; } 45 bool supportsControlTints() const override { return true; }
47 46
48 double initialAutoscrollTimerDelay() override; 47 double initialAutoscrollTimerDelay() override;
49 double autoscrollTimerDelay() override; 48 double autoscrollTimerDelay() override;
50 49
51 void paintTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override; 50 void paintTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override;
52 51
53 static NSScrollerStyle recommendedScrollerStyle(); 52 static NSScrollerStyle recommendedScrollerStyle();
54 53
55 static bool isOverlayAPIAvailable(); 54 static bool isOverlayAPIAvailable();
56 55
57 static bool scrollAnimationEnabledForSystem(); 56 static bool scrollAnimationEnabledForSystem();
58 57
59 protected: 58 protected:
60 int maxOverlapBetweenPages() override { return 40; } 59 int maxOverlapBetweenPages() override { return 40; }
61 60
62 bool shouldDragDocumentInsteadOfThumb(ScrollbarThemeClient*, const PlatformM ouseEvent&) override; 61 bool shouldDragDocumentInsteadOfThumb(ScrollbarThemeClient*, const PlatformM ouseEvent&) override;
63 int scrollbarPartToHIPressedState(ScrollbarPart); 62 int scrollbarPartToHIPressedState(ScrollbarPart);
64 63
65 virtual void updateButtonPlacement(const std::string& buttonPlacement) {} 64 virtual void updateButtonPlacement(ScrollbarButtonsPlacement buttonPlacement ) {}
66 65
67 void paintGivenTickmarks(SkCanvas*, ScrollbarThemeClient*, const IntRect&, c onst Vector<IntRect>&); 66 void paintGivenTickmarks(SkCanvas*, ScrollbarThemeClient*, const IntRect&, c onst Vector<IntRect>&);
68 67
69 RefPtr<Pattern> m_overhangPattern; 68 RefPtr<Pattern> m_overhangPattern;
70 }; 69 };
71 70
72 } 71 }
73 72
74 #endif // ScrollbarThemeMacCommon_h 73 #endif // ScrollbarThemeMacCommon_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698