third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.h - Issue 1511003003: Use refs for non-null GraphicsContext, Scrollbar, etc. in scrollbar related code

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.h

Issue 1511003003: Use refs for non-null GraphicsContext, Scrollbar, etc. in scrollbar related code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ScrollbarRemove

Patch Set: yet another mac fix Created 5 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp ('k') | third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.h

diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.h b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.h

index c412faa15de9f18822a77088fad48cb1154da5ac..036083b32ed6f614451e1ade362603e48954e213 100644

--- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.h

+++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeMacCommon.h

@@ -39,8 +39,8 @@ class PLATFORM_EXPORT ScrollbarThemeMacCommon : public ScrollbarTheme {

public:

~ScrollbarThemeMacCommon() override;

- void registerScrollbar(ScrollbarThemeClient*) override;

- void unregisterScrollbar(ScrollbarThemeClient*) override;

+ void registerScrollbar(ScrollbarThemeClient&) override;

+ void unregisterScrollbar(ScrollbarThemeClient&) override;

void preferencesChanged(float initialButtonDelay, float autoscrollButtonDelay, NSScrollerStyle preferredScrollerStyle, bool redraw, bool scrollAnimationEnabled, ScrollbarButtonsPlacement);

bool supportsControlTints() const override { return true; }

@@ -48,7 +48,7 @@ public:

double initialAutoscrollTimerDelay() override;

double autoscrollTimerDelay() override;

- void paintTickmarks(GraphicsContext*, const ScrollbarThemeClient*, const IntRect&) override;

+ void paintTickmarks(GraphicsContext&, const ScrollbarThemeClient&, const IntRect&) override;

static NSScrollerStyle recommendedScrollerStyle();

@@ -59,12 +59,12 @@ public:

protected:

int maxOverlapBetweenPages() override { return 40; }

- bool shouldDragDocumentInsteadOfThumb(const ScrollbarThemeClient*, const PlatformMouseEvent&) override;

+ bool shouldDragDocumentInsteadOfThumb(const ScrollbarThemeClient&, const PlatformMouseEvent&) override;

int scrollbarPartToHIPressedState(ScrollbarPart);

virtual void updateButtonPlacement(ScrollbarButtonsPlacement) {}

- void paintGivenTickmarks(SkCanvas*, const ScrollbarThemeClient*, const IntRect&, const Vector<IntRect>&);

+ void paintGivenTickmarks(SkCanvas*, const ScrollbarThemeClient&, const IntRect&, const Vector<IntRect>&);

RefPtr<Pattern> m_overhangPattern;

};