Title: [196247] trunk/Source/WebCore
- Revision
- 196247
- Author
- wei...@apple.com
- Date
- 2016-02-07 19:20:17 -0800 (Sun, 07 Feb 2016)
Log Message
Remove unnecessary respondsToSelector checks for methods that exist on all supported platforms
https://bugs.webkit.org/show_bug.cgi?id=153970
Reviewed by Dan Bernstein.
-[NSScrollerImp mouseEnteredScroller], -[NSScrollerImp expansionTransitionProgress],
-[NSScrollerImpPair contentAreaScrolledInDirection:], and -[NSScrollerImp setExpanded:]
are now available on all supported OS's. No need to check for them.
* platform/mac/ScrollAnimatorMac.mm:
(macScrollbarTheme):
(-[WebScrollbarPainterDelegate scrollerImp:animateUIStateTransitionWithDuration:]):
(-[WebScrollbarPainterDelegate scrollerImp:animateExpansionTransitionWithDuration:]):
(WebCore::ScrollAnimatorMac::mouseEnteredScrollbar):
(WebCore::ScrollAnimatorMac::mouseExitedScrollbar):
(WebCore::ScrollAnimatorMac::sendContentAreaScrolled):
(WebCore::ScrollAnimatorMac::sendContentAreaScrolledTimerFired):
(supportsUIStateTransitionProgress): Deleted.
(supportsExpansionTransitionProgress): Deleted.
(supportsContentAreaScrolledInDirection): Deleted.
* platform/mac/ScrollbarThemeMac.mm:
(+[WebScrollbarPrefsObserver appearancePrefsChanged:]):
(+[WebScrollbarPrefsObserver behaviorPrefsChanged:]):
(WebCore::ScrollbarThemeMac::scrollbarThickness):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (196246 => 196247)
--- trunk/Source/WebCore/ChangeLog 2016-02-08 03:01:07 UTC (rev 196246)
+++ trunk/Source/WebCore/ChangeLog 2016-02-08 03:20:17 UTC (rev 196247)
@@ -1,5 +1,32 @@
2016-02-07 Sam Weinig <s...@webkit.org>
+ Remove unnecessary respondsToSelector checks for methods that exist on all supported platforms
+ https://bugs.webkit.org/show_bug.cgi?id=153970
+
+ Reviewed by Dan Bernstein.
+
+ -[NSScrollerImp mouseEnteredScroller], -[NSScrollerImp expansionTransitionProgress],
+ -[NSScrollerImpPair contentAreaScrolledInDirection:], and -[NSScrollerImp setExpanded:]
+ are now available on all supported OS's. No need to check for them.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (macScrollbarTheme):
+ (-[WebScrollbarPainterDelegate scrollerImp:animateUIStateTransitionWithDuration:]):
+ (-[WebScrollbarPainterDelegate scrollerImp:animateExpansionTransitionWithDuration:]):
+ (WebCore::ScrollAnimatorMac::mouseEnteredScrollbar):
+ (WebCore::ScrollAnimatorMac::mouseExitedScrollbar):
+ (WebCore::ScrollAnimatorMac::sendContentAreaScrolled):
+ (WebCore::ScrollAnimatorMac::sendContentAreaScrolledTimerFired):
+ (supportsUIStateTransitionProgress): Deleted.
+ (supportsExpansionTransitionProgress): Deleted.
+ (supportsContentAreaScrolledInDirection): Deleted.
+ * platform/mac/ScrollbarThemeMac.mm:
+ (+[WebScrollbarPrefsObserver appearancePrefsChanged:]):
+ (+[WebScrollbarPrefsObserver behaviorPrefsChanged:]):
+ (WebCore::ScrollbarThemeMac::scrollbarThickness):
+
+2016-02-07 Sam Weinig <s...@webkit.org>
+
Use modern SPI header idiom for NSScrollerImp and NSScrollerImpPair
https://bugs.webkit.org/show_bug.cgi?id=153969
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (196246 => 196247)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2016-02-08 03:01:07 UTC (rev 196246)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2016-02-08 03:20:17 UTC (rev 196247)
@@ -45,25 +45,6 @@
using namespace WebCore;
-static bool supportsUIStateTransitionProgress()
-{
- // FIXME: This is temporary until all platforms that support ScrollbarPainter support this part of the API.
- static const bool globalSupportsUIStateTransitionProgress = [[NSScrollerImp class] instancesRespondToSelector:@selector(mouseEnteredScroller)];
- return globalSupportsUIStateTransitionProgress;
-}
-
-static bool supportsExpansionTransitionProgress()
-{
- static const bool globalSupportsExpansionTransitionProgress = [[NSScrollerImp class] instancesRespondToSelector:@selector(expansionTransitionProgress)];
- return globalSupportsExpansionTransitionProgress;
-}
-
-static bool supportsContentAreaScrolledInDirection()
-{
- static const bool globalSupportsContentAreaScrolledInDirection = [[NSScrollerImpPair class] instancesRespondToSelector:@selector(contentAreaScrolledInDirection:)];
- return globalSupportsContentAreaScrolledInDirection;
-}
-
static ScrollbarThemeMac* macScrollbarTheme()
{
ScrollbarTheme& scrollbarTheme = ScrollbarTheme::theme();
@@ -556,9 +537,6 @@
if (!_scrollbar)
return;
- if (!supportsUIStateTransitionProgress())
- return;
-
ASSERT(scrollerImp == scrollbarPainterForScrollbar(*_scrollbar));
ScrollbarPainter scrollbarPainter = (ScrollbarPainter)scrollerImp;
@@ -590,9 +568,6 @@
if (!_scrollbar)
return;
- if (!supportsExpansionTransitionProgress())
- return;
-
ASSERT(scrollerImp == scrollbarPainterForScrollbar(*_scrollbar));
ScrollbarPainter scrollbarPainter = (ScrollbarPainter)scrollerImp;
@@ -840,8 +815,6 @@
if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
return;
- if (!supportsUIStateTransitionProgress())
- return;
if (ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar))
[painter mouseEnteredScroller];
}
@@ -855,8 +828,6 @@
if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
return;
- if (!supportsUIStateTransitionProgress())
- return;
if (ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar))
[painter mouseExitedScroller];
}
@@ -1403,10 +1374,7 @@
void ScrollAnimatorMac::sendContentAreaScrolled(const FloatSize& delta)
{
- if (supportsContentAreaScrolledInDirection())
- [m_scrollbarPainterController contentAreaScrolledInDirection:NSMakePoint(delta.width(), delta.height())];
- else
- [m_scrollbarPainterController contentAreaScrolled];
+ [m_scrollbarPainterController contentAreaScrolledInDirection:NSMakePoint(delta.width(), delta.height())];
}
void ScrollAnimatorMac::sendContentAreaScrolledTimerFired()
Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (196246 => 196247)
--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-02-08 03:01:07 UTC (rev 196246)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-02-08 03:20:17 UTC (rev 196247)
@@ -68,14 +68,14 @@
}
+ (void)registerAsObserver;
-+ (void)appearancePrefsChanged:(NSNotification*)theNotification;
-+ (void)behaviorPrefsChanged:(NSNotification*)theNotification;
++ (void)appearancePrefsChanged:(NSNotification *)theNotification;
++ (void)behaviorPrefsChanged:(NSNotification *)theNotification;
@end
@implementation WebScrollbarPrefsObserver
-+ (void)appearancePrefsChanged:(NSNotification*)unusedNotification
++ (void)appearancePrefsChanged:(NSNotification *)unusedNotification
{
UNUSED_PARAM(unusedNotification);
@@ -93,7 +93,7 @@
}
}
-+ (void)behaviorPrefsChanged:(NSNotification*)unusedNotification
++ (void)behaviorPrefsChanged:(NSNotification *)unusedNotification
{
UNUSED_PARAM(unusedNotification);
@@ -136,13 +136,6 @@
static ScrollbarButtonsPlacement gButtonPlacement = ScrollbarButtonsDoubleEnd;
-static bool supportsExpandedScrollbars()
-{
- // FIXME: This is temporary until all platforms that support ScrollbarPainter support this part of the API.
- static bool globalSupportsExpandedScrollbars = [[NSScrollerImp class] instancesRespondToSelector:@selector(setExpanded:)];
- return globalSupportsExpandedScrollbars;
-}
-
static NSControlSize scrollbarControlSizeToNSControlSize(ScrollbarControlSize controlSize)
{
switch (controlSize) {
@@ -226,8 +219,7 @@
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
ScrollbarPainter scrollbarPainter = [NSScrollerImp scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(controlSize) horizontal:NO replacingScrollerImp:nil];
- if (supportsExpandedScrollbars())
- [scrollbarPainter setExpanded:YES];
+ [scrollbarPainter setExpanded:YES];
return [scrollbarPainter trackBoxWidth];
END_BLOCK_OBJC_EXCEPTIONS;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
