<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196247] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196247">196247</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-02-07 19:20:17 -0800 (Sun, 07 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollbarThemeMacmm">trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196246 => 196247)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-02-07 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><ins>+ 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 <sam@webkit.org>
+
</ins><span class="cx"> Use modern SPI header idiom for NSScrollerImp and NSScrollerImpPair
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153969
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (196246 => 196247)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,25 +45,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> static ScrollbarThemeMac* macScrollbarTheme()
</span><span class="cx"> {
</span><span class="cx"> ScrollbarTheme& scrollbarTheme = ScrollbarTheme::theme();
</span><span class="lines">@@ -556,9 +537,6 @@
</span><span class="cx"> if (!_scrollbar)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!supportsUIStateTransitionProgress())
- return;
-
</del><span class="cx"> ASSERT(scrollerImp == scrollbarPainterForScrollbar(*_scrollbar));
</span><span class="cx">
</span><span class="cx"> ScrollbarPainter scrollbarPainter = (ScrollbarPainter)scrollerImp;
</span><span class="lines">@@ -590,9 +568,6 @@
</span><span class="cx"> if (!_scrollbar)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!supportsExpansionTransitionProgress())
- return;
-
</del><span class="cx"> ASSERT(scrollerImp == scrollbarPainterForScrollbar(*_scrollbar));
</span><span class="cx">
</span><span class="cx"> ScrollbarPainter scrollbarPainter = (ScrollbarPainter)scrollerImp;
</span><span class="lines">@@ -840,8 +815,6 @@
</span><span class="cx"> if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!supportsUIStateTransitionProgress())
- return;
</del><span class="cx"> if (ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar))
</span><span class="cx"> [painter mouseEnteredScroller];
</span><span class="cx"> }
</span><span class="lines">@@ -855,8 +828,6 @@
</span><span class="cx"> if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!supportsUIStateTransitionProgress())
- return;
</del><span class="cx"> if (ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar))
</span><span class="cx"> [painter mouseExitedScroller];
</span><span class="cx"> }
</span><span class="lines">@@ -1403,10 +1374,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::sendContentAreaScrolled(const FloatSize& delta)
</span><span class="cx"> {
</span><del>- if (supportsContentAreaScrolledInDirection())
- [m_scrollbarPainterController contentAreaScrolledInDirection:NSMakePoint(delta.width(), delta.height())];
- else
- [m_scrollbarPainterController contentAreaScrolled];
</del><ins>+ [m_scrollbarPainterController contentAreaScrolledInDirection:NSMakePoint(delta.width(), delta.height())];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::sendContentAreaScrolledTimerFired()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollbarThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (196246 => 196247)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -68,14 +68,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)registerAsObserver;
</span><del>-+ (void)appearancePrefsChanged:(NSNotification*)theNotification;
-+ (void)behaviorPrefsChanged:(NSNotification*)theNotification;
</del><ins>++ (void)appearancePrefsChanged:(NSNotification *)theNotification;
++ (void)behaviorPrefsChanged:(NSNotification *)theNotification;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebScrollbarPrefsObserver
</span><span class="cx">
</span><del>-+ (void)appearancePrefsChanged:(NSNotification*)unusedNotification
</del><ins>++ (void)appearancePrefsChanged:(NSNotification *)unusedNotification
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(unusedNotification);
</span><span class="cx">
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-+ (void)behaviorPrefsChanged:(NSNotification*)unusedNotification
</del><ins>++ (void)behaviorPrefsChanged:(NSNotification *)unusedNotification
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(unusedNotification);
</span><span class="cx">
</span><span class="lines">@@ -136,13 +136,6 @@
</span><span class="cx">
</span><span class="cx"> static ScrollbarButtonsPlacement gButtonPlacement = ScrollbarButtonsDoubleEnd;
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> static NSControlSize scrollbarControlSizeToNSControlSize(ScrollbarControlSize controlSize)
</span><span class="cx"> {
</span><span class="cx"> switch (controlSize) {
</span><span class="lines">@@ -226,8 +219,7 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> ScrollbarPainter scrollbarPainter = [NSScrollerImp scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(controlSize) horizontal:NO replacingScrollerImp:nil];
</span><del>- if (supportsExpandedScrollbars())
- [scrollbarPainter setExpanded:YES];
</del><ins>+ [scrollbarPainter setExpanded:YES];
</ins><span class="cx"> return [scrollbarPainter trackBoxWidth];
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>