<!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>[198078] 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/198078">198078</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-03-12 19:58:41 -0800 (Sat, 12 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Remove typedef from NSScrollerImp to ScrollbarPainter
https://bugs.webkit.org/show_bug.cgi?id=155379
Reviewed by Beth Dakin.
There's no reason to not call them what they are.
No new tests because there is no behavior change.
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
* page/scrolling/ScrollingStateFrameScrollingNode.cpp:
(WebCore::ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode):
(WebCore::ScrollingStateFrameScrollingNode::setScrollerImpsFromScrollbars):
(WebCore::ScrollingStateFrameScrollingNode::setScrollbarPaintersFromScrollbars): Deleted.
* page/scrolling/ScrollingStateFrameScrollingNode.h:
* page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm:
(WebCore::ScrollingStateFrameScrollingNode::setScrollerImpsFromScrollbars):
(WebCore::ScrollingStateFrameScrollingNode::setScrollbarPaintersFromScrollbars): Deleted.
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::ScrollingTreeFrameScrollingNodeMac):
(WebCore::ScrollingTreeFrameScrollingNodeMac::~ScrollingTreeFrameScrollingNodeMac):
(WebCore::ScrollingTreeFrameScrollingNodeMac::releaseReferencesToScrollerImpsOnTheMainThread):
(WebCore::ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren):
(WebCore::ScrollingTreeFrameScrollingNodeMac::handleWheelEvent):
(WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition):
(WebCore::ScrollingTreeFrameScrollingNodeMac::releaseReferencesToScrollbarPaintersOnTheMainThread): Deleted.
* platform/ScrollbarThemeComposite.h:
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(scrollbarPainterForScrollbar):
(-[WebScrollerImpDelegate setUpAlphaAnimation:scrollerPainter:part:animateAlphaTo:duration:]):
(-[WebScrollerImpDelegate scrollerImp:animateKnobAlphaTo:duration:]):
(-[WebScrollerImpDelegate scrollerImp:animateTrackAlphaTo:duration:]):
(-[WebScrollerImpDelegate scrollerImp:animateUIStateTransitionWithDuration:]):
(-[WebScrollerImpDelegate scrollerImp:animateExpansionTransitionWithDuration:]):
(WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
(WebCore::ScrollAnimatorMac::~ScrollAnimatorMac):
(WebCore::ScrollAnimatorMac::mouseEnteredScrollbar):
(WebCore::ScrollAnimatorMac::mouseExitedScrollbar):
(WebCore::ScrollAnimatorMac::mouseIsDownInScrollbar):
(WebCore::ScrollAnimatorMac::didAddVerticalScrollbar):
(WebCore::ScrollAnimatorMac::willRemoveVerticalScrollbar):
(WebCore::ScrollAnimatorMac::didAddHorizontalScrollbar):
(WebCore::ScrollAnimatorMac::willRemoveHorizontalScrollbar):
(WebCore::ScrollAnimatorMac::invalidateScrollbarPartLayers):
(WebCore::ScrollAnimatorMac::verticalScrollbarLayerDidChange):
(WebCore::ScrollAnimatorMac::horizontalScrollbarLayerDidChange):
(WebCore::ScrollAnimatorMac::shouldScrollbarParticipateInHitTesting):
(WebCore::ScrollAnimatorMac::notifyContentAreaScrolled):
(WebCore::ScrollAnimatorMac::cancelAnimations):
(WebCore::ScrollAnimatorMac::updateScrollerStyle):
(WebCore::ScrollAnimatorMac::initialScrollbarPaintTimerFired):
(-[WebScrollbarPainterDelegate setUpAlphaAnimation:scrollerPainter:part:animateAlphaTo:duration:]): Deleted.
(-[WebScrollbarPainterDelegate scrollerImp:animateKnobAlphaTo:duration:]): Deleted.
(-[WebScrollbarPainterDelegate scrollerImp:animateTrackAlphaTo:duration:]): Deleted.
(-[WebScrollbarPainterDelegate scrollerImp:animateUIStateTransitionWithDuration:]): Deleted.
(-[WebScrollbarPainterDelegate scrollerImp:animateExpansionTransitionWithDuration:]): Deleted.
* platform/mac/ScrollbarThemeMac.h:
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::scrollbarMap):
(+[WebScrollbarPrefsObserver appearancePrefsChanged:]):
(WebCore::ScrollbarThemeMac::registerScrollbar):
(WebCore::ScrollbarThemeMac::setNewPainterForScrollbar):
(WebCore::ScrollbarThemeMac::painterForScrollbar):
(WebCore::ScrollbarThemeMac::scrollbarThickness):
(WebCore::ScrollbarThemeMac::updateScrollbarOverlayStyle):
(WebCore::ScrollbarThemeMac::hasThumb):
(WebCore::ScrollbarThemeMac::setPaintCharacteristicsForScrollbar):
(WebCore::scrollbarPainterPaint):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateFrameScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateFrameScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingStateFrameScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarThemeCompositeh">trunk/Source/WebCore/platform/ScrollbarThemeComposite.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMach">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollbarThemeMach">trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h</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 (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/ChangeLog 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -1,3 +1,77 @@
</span><ins>+2016-03-12 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Remove typedef from NSScrollerImp to ScrollbarPainter
+ https://bugs.webkit.org/show_bug.cgi?id=155379
+
+ Reviewed by Beth Dakin.
+
+ There's no reason to not call them what they are.
+
+ No new tests because there is no behavior change.
+
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
+ * page/scrolling/ScrollingStateFrameScrollingNode.cpp:
+ (WebCore::ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode):
+ (WebCore::ScrollingStateFrameScrollingNode::setScrollerImpsFromScrollbars):
+ (WebCore::ScrollingStateFrameScrollingNode::setScrollbarPaintersFromScrollbars): Deleted.
+ * page/scrolling/ScrollingStateFrameScrollingNode.h:
+ * page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingStateFrameScrollingNode::setScrollerImpsFromScrollbars):
+ (WebCore::ScrollingStateFrameScrollingNode::setScrollbarPaintersFromScrollbars): Deleted.
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::ScrollingTreeFrameScrollingNodeMac):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::~ScrollingTreeFrameScrollingNodeMac):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::releaseReferencesToScrollerImpsOnTheMainThread):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::handleWheelEvent):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::releaseReferencesToScrollbarPaintersOnTheMainThread): Deleted.
+ * platform/ScrollbarThemeComposite.h:
+ * platform/mac/ScrollAnimatorMac.h:
+ * platform/mac/ScrollAnimatorMac.mm:
+ (scrollbarPainterForScrollbar):
+ (-[WebScrollerImpDelegate setUpAlphaAnimation:scrollerPainter:part:animateAlphaTo:duration:]):
+ (-[WebScrollerImpDelegate scrollerImp:animateKnobAlphaTo:duration:]):
+ (-[WebScrollerImpDelegate scrollerImp:animateTrackAlphaTo:duration:]):
+ (-[WebScrollerImpDelegate scrollerImp:animateUIStateTransitionWithDuration:]):
+ (-[WebScrollerImpDelegate scrollerImp:animateExpansionTransitionWithDuration:]):
+ (WebCore::ScrollAnimatorMac::ScrollAnimatorMac):
+ (WebCore::ScrollAnimatorMac::~ScrollAnimatorMac):
+ (WebCore::ScrollAnimatorMac::mouseEnteredScrollbar):
+ (WebCore::ScrollAnimatorMac::mouseExitedScrollbar):
+ (WebCore::ScrollAnimatorMac::mouseIsDownInScrollbar):
+ (WebCore::ScrollAnimatorMac::didAddVerticalScrollbar):
+ (WebCore::ScrollAnimatorMac::willRemoveVerticalScrollbar):
+ (WebCore::ScrollAnimatorMac::didAddHorizontalScrollbar):
+ (WebCore::ScrollAnimatorMac::willRemoveHorizontalScrollbar):
+ (WebCore::ScrollAnimatorMac::invalidateScrollbarPartLayers):
+ (WebCore::ScrollAnimatorMac::verticalScrollbarLayerDidChange):
+ (WebCore::ScrollAnimatorMac::horizontalScrollbarLayerDidChange):
+ (WebCore::ScrollAnimatorMac::shouldScrollbarParticipateInHitTesting):
+ (WebCore::ScrollAnimatorMac::notifyContentAreaScrolled):
+ (WebCore::ScrollAnimatorMac::cancelAnimations):
+ (WebCore::ScrollAnimatorMac::updateScrollerStyle):
+ (WebCore::ScrollAnimatorMac::initialScrollbarPaintTimerFired):
+ (-[WebScrollbarPainterDelegate setUpAlphaAnimation:scrollerPainter:part:animateAlphaTo:duration:]): Deleted.
+ (-[WebScrollbarPainterDelegate scrollerImp:animateKnobAlphaTo:duration:]): Deleted.
+ (-[WebScrollbarPainterDelegate scrollerImp:animateTrackAlphaTo:duration:]): Deleted.
+ (-[WebScrollbarPainterDelegate scrollerImp:animateUIStateTransitionWithDuration:]): Deleted.
+ (-[WebScrollbarPainterDelegate scrollerImp:animateExpansionTransitionWithDuration:]): Deleted.
+ * platform/mac/ScrollbarThemeMac.h:
+ * platform/mac/ScrollbarThemeMac.mm:
+ (WebCore::scrollbarMap):
+ (+[WebScrollbarPrefsObserver appearancePrefsChanged:]):
+ (WebCore::ScrollbarThemeMac::registerScrollbar):
+ (WebCore::ScrollbarThemeMac::setNewPainterForScrollbar):
+ (WebCore::ScrollbarThemeMac::painterForScrollbar):
+ (WebCore::ScrollbarThemeMac::scrollbarThickness):
+ (WebCore::ScrollbarThemeMac::updateScrollbarOverlayStyle):
+ (WebCore::ScrollbarThemeMac::hasThumb):
+ (WebCore::ScrollbarThemeMac::setPaintCharacteristicsForScrollbar):
+ (WebCore::scrollbarPainterPaint):
+
</ins><span class="cx"> 2016-03-12 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r188647): Teamtreehouse website sidebar buttons are not rendered
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> Scrollbar* verticalScrollbar = frameView.verticalScrollbar();
</span><span class="cx"> Scrollbar* horizontalScrollbar = frameView.horizontalScrollbar();
</span><del>- node->setScrollbarPaintersFromScrollbars(verticalScrollbar, horizontalScrollbar);
</del><ins>+ node->setScrollerImpsFromScrollbars(verticalScrollbar, horizontalScrollbar);
</ins><span class="cx">
</span><span class="cx"> node->setFrameScaleFactor(frameView.frame().frameScaleFactor());
</span><span class="cx"> node->setHeaderHeight(frameView.headerHeight());
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateFrameScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx"> ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode(const ScrollingStateFrameScrollingNode& stateNode, ScrollingStateTree& adoptiveTree)
</span><span class="cx"> : ScrollingStateScrollingNode(stateNode, adoptiveTree)
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- , m_verticalScrollbarPainter(stateNode.verticalScrollbarPainter())
- , m_horizontalScrollbarPainter(stateNode.horizontalScrollbarPainter())
</del><ins>+ , m_verticalScrollerImp(stateNode.verticalScrollerImp())
+ , m_horizontalScrollerImp(stateNode.horizontalScrollerImp())
</ins><span class="cx"> #endif
</span><span class="cx"> , m_nonFastScrollableRegion(stateNode.nonFastScrollableRegion())
</span><span class="cx"> , m_requestedScrollPosition(stateNode.requestedScrollPosition())
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(MAC)
</span><del>-void ScrollingStateFrameScrollingNode::setScrollbarPaintersFromScrollbars(Scrollbar*, Scrollbar*)
</del><ins>+void ScrollingStateFrameScrollingNode::setScrollerImpsFromScrollbars(Scrollbar*, Scrollbar*)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateFrameScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -114,10 +114,10 @@
</span><span class="cx"> WEBCORE_EXPORT void setFixedElementsLayoutRelativeToFrame(bool);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- ScrollbarPainter verticalScrollbarPainter() const { return m_verticalScrollbarPainter.get(); }
- ScrollbarPainter horizontalScrollbarPainter() const { return m_horizontalScrollbarPainter.get(); }
</del><ins>+ NSScrollerImp *verticalScrollerImp() const { return m_verticalScrollerImp.get(); }
+ NSScrollerImp *horizontalScrollerImp() const { return m_horizontalScrollerImp.get(); }
</ins><span class="cx"> #endif
</span><del>- void setScrollbarPaintersFromScrollbars(Scrollbar* verticalScrollbar, Scrollbar* horizontalScrollbar);
</del><ins>+ void setScrollerImpsFromScrollbars(Scrollbar* verticalScrollbar, Scrollbar* horizontalScrollbar);
</ins><span class="cx">
</span><span class="cx"> void dumpProperties(TextStream&, int indent) const override;
</span><span class="cx">
</span><span class="lines">@@ -133,8 +133,8 @@
</span><span class="cx"> LayerRepresentation m_footerLayer;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- RetainPtr<ScrollbarPainter> m_verticalScrollbarPainter;
- RetainPtr<ScrollbarPainter> m_horizontalScrollbarPainter;
</del><ins>+ RetainPtr<NSScrollerImp> m_verticalScrollerImp;
+ RetainPtr<NSScrollerImp> m_horizontalScrollerImp;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Region m_nonFastScrollableRegion;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingStateFrameScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -35,23 +35,23 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void ScrollingStateFrameScrollingNode::setScrollbarPaintersFromScrollbars(Scrollbar* verticalScrollbar, Scrollbar* horizontalScrollbar)
</del><ins>+void ScrollingStateFrameScrollingNode::setScrollerImpsFromScrollbars(Scrollbar* verticalScrollbar, Scrollbar* horizontalScrollbar)
</ins><span class="cx"> {
</span><span class="cx"> ScrollbarTheme& scrollbarTheme = ScrollbarTheme::theme();
</span><span class="cx"> if (scrollbarTheme.isMockTheme())
</span><span class="cx"> return;
</span><span class="cx"> ScrollbarThemeMac& macTheme = static_cast<ScrollbarThemeMac&>(scrollbarTheme);
</span><span class="cx">
</span><del>- ScrollbarPainter verticalPainter = verticalScrollbar && verticalScrollbar->supportsUpdateOnSecondaryThread()
</del><ins>+ NSScrollerImp *verticalPainter = verticalScrollbar && verticalScrollbar->supportsUpdateOnSecondaryThread()
</ins><span class="cx"> ? macTheme.painterForScrollbar(*verticalScrollbar) : nullptr;
</span><del>- ScrollbarPainter horizontalPainter = horizontalScrollbar && horizontalScrollbar->supportsUpdateOnSecondaryThread()
</del><ins>+ NSScrollerImp *horizontalPainter = horizontalScrollbar && horizontalScrollbar->supportsUpdateOnSecondaryThread()
</ins><span class="cx"> ? macTheme.painterForScrollbar(*horizontalScrollbar) : nullptr;
</span><span class="cx">
</span><del>- if (m_verticalScrollbarPainter == verticalPainter && m_horizontalScrollbarPainter == horizontalPainter)
</del><ins>+ if (m_verticalScrollerImp == verticalPainter && m_horizontalScrollerImp == horizontalPainter)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_verticalScrollbarPainter = verticalPainter;
- m_horizontalScrollbarPainter = horizontalPainter;
</del><ins>+ m_verticalScrollerImp = verticalPainter;
+ m_horizontalScrollerImp = horizontalPainter;
</ins><span class="cx">
</span><span class="cx"> setPropertyChanged(PainterForScrollbar);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> private:
</span><span class="cx"> ScrollingTreeFrameScrollingNodeMac(ScrollingTree&, ScrollingNodeID);
</span><span class="cx">
</span><del>- void releaseReferencesToScrollbarPaintersOnTheMainThread();
</del><ins>+ void releaseReferencesToScrollerImpsOnTheMainThread();
</ins><span class="cx">
</span><span class="cx"> // ScrollingTreeNode member functions.
</span><span class="cx"> void updateBeforeChildren(const ScrollingStateNode&) override;
</span><span class="lines">@@ -103,8 +103,8 @@
</span><span class="cx"> RetainPtr<CALayer> m_contentShadowLayer;
</span><span class="cx"> RetainPtr<CALayer> m_headerLayer;
</span><span class="cx"> RetainPtr<CALayer> m_footerLayer;
</span><del>- RetainPtr<ScrollbarPainter> m_verticalScrollbarPainter;
- RetainPtr<ScrollbarPainter> m_horizontalScrollbarPainter;
</del><ins>+ RetainPtr<NSScrollerImp> m_verticalScrollerImp;
+ RetainPtr<NSScrollerImp> m_horizontalScrollerImp;
</ins><span class="cx"> FloatPoint m_probableMainThreadScrollPosition;
</span><span class="cx"> bool m_lastScrollHadUnfilledPixels { false };
</span><span class="cx"> bool m_hadFirstUpdate { false };
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -60,26 +60,26 @@
</span><span class="cx"> ScrollingTreeFrameScrollingNodeMac::ScrollingTreeFrameScrollingNodeMac(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</span><span class="cx"> : ScrollingTreeFrameScrollingNode(scrollingTree, nodeID)
</span><span class="cx"> , m_scrollController(*this)
</span><del>- , m_verticalScrollbarPainter(nullptr)
- , m_horizontalScrollbarPainter(nullptr)
</del><ins>+ , m_verticalScrollerImp(nullptr)
+ , m_horizontalScrollerImp(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingTreeFrameScrollingNodeMac::~ScrollingTreeFrameScrollingNodeMac()
</span><span class="cx"> {
</span><del>- releaseReferencesToScrollbarPaintersOnTheMainThread();
</del><ins>+ releaseReferencesToScrollerImpsOnTheMainThread();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeFrameScrollingNodeMac::releaseReferencesToScrollbarPaintersOnTheMainThread()
</del><ins>+void ScrollingTreeFrameScrollingNodeMac::releaseReferencesToScrollerImpsOnTheMainThread()
</ins><span class="cx"> {
</span><del>- if (m_verticalScrollbarPainter || m_horizontalScrollbarPainter) {
</del><ins>+ if (m_verticalScrollerImp || m_horizontalScrollerImp) {
</ins><span class="cx"> // FIXME: This is a workaround in place for the time being since NSScrollerImps cannot be deallocated
</span><span class="cx"> // on a non-main thread. rdar://problem/24535055
</span><del>- ScrollbarPainter retainedVerticalScrollbarPainter = m_verticalScrollbarPainter.leakRef();
- ScrollbarPainter retainedHorizontalScrollbarPainter = m_horizontalScrollbarPainter.leakRef();
- WTF::callOnMainThread([retainedVerticalScrollbarPainter, retainedHorizontalScrollbarPainter] {
- [retainedVerticalScrollbarPainter release];
- [retainedHorizontalScrollbarPainter release];
</del><ins>+ NSScrollerImp *retainedVerticalScrollerImp = m_verticalScrollerImp.leakRef();
+ NSScrollerImp *retainedHorizontalScrollerImp = m_horizontalScrollerImp.leakRef();
+ WTF::callOnMainThread([retainedVerticalScrollerImp, retainedHorizontalScrollerImp] {
+ [retainedVerticalScrollerImp release];
+ [retainedHorizontalScrollerImp release];
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -123,9 +123,9 @@
</span><span class="cx"> m_footerLayer = scrollingStateNode.footerLayer();
</span><span class="cx">
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::PainterForScrollbar)) {
</span><del>- releaseReferencesToScrollbarPaintersOnTheMainThread();
- m_verticalScrollbarPainter = scrollingStateNode.verticalScrollbarPainter();
- m_horizontalScrollbarPainter = scrollingStateNode.horizontalScrollbarPainter();
</del><ins>+ releaseReferencesToScrollerImpsOnTheMainThread();
+ m_verticalScrollerImp = scrollingStateNode.verticalScrollerImp();
+ m_horizontalScrollerImp = scrollingStateNode.horizontalScrollerImp();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool logScrollingMode = !m_hadFirstUpdate;
</span><span class="lines">@@ -191,12 +191,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (wheelEvent.momentumPhase() == PlatformWheelEventPhaseBegan) {
</span><del>- [m_verticalScrollbarPainter setUsePresentationValue:YES];
- [m_horizontalScrollbarPainter setUsePresentationValue:YES];
</del><ins>+ [m_verticalScrollerImp setUsePresentationValue:YES];
+ [m_horizontalScrollerImp setUsePresentationValue:YES];
</ins><span class="cx"> }
</span><span class="cx"> if (wheelEvent.momentumPhase() == PlatformWheelEventPhaseEnded || wheelEvent.momentumPhase() == PlatformWheelEventPhaseCancelled) {
</span><del>- [m_verticalScrollbarPainter setUsePresentationValue:NO];
- [m_horizontalScrollbarPainter setUsePresentationValue:NO];
</del><ins>+ [m_verticalScrollerImp setUsePresentationValue:NO];
+ [m_horizontalScrollerImp setUsePresentationValue:NO];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</span><span class="lines">@@ -442,22 +442,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_verticalScrollbarPainter || m_horizontalScrollbarPainter) {
</del><ins>+ if (m_verticalScrollerImp || m_horizontalScrollerImp) {
</ins><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction lock];
</span><span class="cx">
</span><del>- if ([m_verticalScrollbarPainter shouldUsePresentationValue]) {
</del><ins>+ if ([m_verticalScrollerImp shouldUsePresentationValue]) {
</ins><span class="cx"> float presentationValue;
</span><span class="cx"> float overhangAmount;
</span><span class="cx"> ScrollableArea::computeScrollbarValueAndOverhang(position.y(), totalContentsSize().height(), viewportRect.height(), presentationValue, overhangAmount);
</span><del>- [m_verticalScrollbarPainter setPresentationValue:presentationValue];
</del><ins>+ [m_verticalScrollerImp setPresentationValue:presentationValue];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ([m_horizontalScrollbarPainter shouldUsePresentationValue]) {
</del><ins>+ if ([m_horizontalScrollerImp shouldUsePresentationValue]) {
</ins><span class="cx"> float presentationValue;
</span><span class="cx"> float overhangAmount;
</span><span class="cx"> ScrollableArea::computeScrollbarValueAndOverhang(position.x(), totalContentsSize().width(), viewportRect.width(), presentationValue, overhangAmount);
</span><del>- [m_horizontalScrollbarPainter setPresentationValue:presentationValue];
</del><ins>+ [m_horizontalScrollerImp setPresentationValue:presentationValue];
</ins><span class="cx"> }
</span><span class="cx"> [CATransaction unlock];
</span><span class="cx"> [CATransaction commit];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarThemeCompositeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollbarThemeComposite.h (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollbarThemeComposite.h 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/platform/ScrollbarThemeComposite.h 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -30,9 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> OBJC_CLASS NSScrollerImp;
</span><del>-typedef NSScrollerImp *ScrollbarPainter;
-#else
-typedef void* ScrollbarPainter;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS WebScrollAnimationHelperDelegate;
</span><del>-OBJC_CLASS WebScrollbarPainterControllerDelegate;
-OBJC_CLASS WebScrollbarPainterDelegate;
</del><ins>+OBJC_CLASS WebScrollerImpPairDelegate;
+OBJC_CLASS WebScrollerImpDelegate;
</ins><span class="cx">
</span><del>-typedef id ScrollbarPainterController;
</del><ins>+typedef id ScrollerImpPair;
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx"> RetainPtr<id> m_scrollAnimationHelper;
</span><span class="cx"> RetainPtr<WebScrollAnimationHelperDelegate> m_scrollAnimationHelperDelegate;
</span><span class="cx">
</span><del>- RetainPtr<ScrollbarPainterController> m_scrollbarPainterController;
- RetainPtr<WebScrollbarPainterControllerDelegate> m_scrollbarPainterControllerDelegate;
- RetainPtr<WebScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate;
- RetainPtr<WebScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate;
</del><ins>+ RetainPtr<ScrollerImpPair> m_scrollbarPainterController;
+ RetainPtr<WebScrollerImpPairDelegate> m_scrollbarPainterControllerDelegate;
+ RetainPtr<WebScrollerImpDelegate> m_horizontalScrollerImpDelegate;
+ RetainPtr<WebScrollerImpDelegate> m_verticalScrollerImpDelegate;
</ins><span class="cx">
</span><span class="cx"> void initialScrollbarPaintTimerFired();
</span><span class="cx"> Timer m_initialScrollbarPaintTimer;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> return !scrollbarTheme.isMockTheme() ? static_cast<ScrollbarThemeMac*>(&scrollbarTheme) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ScrollbarPainter scrollbarPainterForScrollbar(Scrollbar& scrollbar)
</del><ins>+static NSScrollerImp *scrollbarPainterForScrollbar(Scrollbar& scrollbar)
</ins><span class="cx"> {
</span><span class="cx"> if (ScrollbarThemeMac* scrollbarTheme = macScrollbarTheme())
</span><span class="cx"> return scrollbarTheme->painterForScrollbar(scrollbar);
</span><span class="lines">@@ -163,14 +163,14 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WebScrollbarPainterControllerDelegate : NSObject <NSScrollerImpPairDelegate>
</del><ins>+@interface WebScrollerImpPairDelegate : NSObject <NSScrollerImpPairDelegate>
</ins><span class="cx"> {
</span><span class="cx"> ScrollableArea* _scrollableArea;
</span><span class="cx"> }
</span><span class="cx"> - (id)initWithScrollableArea:(ScrollableArea*)scrollableArea;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation WebScrollbarPainterControllerDelegate
</del><ins>+@implementation WebScrollerImpPairDelegate
</ins><span class="cx">
</span><span class="cx"> - (id)initWithScrollableArea:(ScrollableArea*)scrollableArea
</span><span class="cx"> {
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> @interface WebScrollbarPartAnimation : NSAnimation
</span><span class="cx"> {
</span><span class="cx"> Scrollbar* _scrollbar;
</span><del>- RetainPtr<ScrollbarPainter> _scrollbarPainter;
</del><ins>+ RetainPtr<NSScrollerImp> _scrollbarPainter;
</ins><span class="cx"> FeatureToAnimate _featureToAnimate;
</span><span class="cx"> CGFloat _startValue;
</span><span class="cx"> CGFloat _endValue;
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WebScrollbarPainterDelegate : NSObject<NSAnimationDelegate, NSScrollerImpDelegate>
</del><ins>+@interface WebScrollerImpDelegate : NSObject<NSAnimationDelegate, NSScrollerImpDelegate>
</ins><span class="cx"> {
</span><span class="cx"> WebCore::Scrollbar* _scrollbar;
</span><span class="cx">
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> - (void)cancelAnimations;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation WebScrollbarPainterDelegate
</del><ins>+@implementation WebScrollerImpDelegate
</ins><span class="cx">
</span><span class="cx"> - (id)initWithScrollbar:(WebCore::Scrollbar*)scrollbar
</span><span class="cx"> {
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> return _scrollbar->supportsUpdateOnSecondaryThread();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setUpAlphaAnimation:(RetainPtr<WebScrollbarPartAnimation>&)scrollbarPartAnimation scrollerPainter:(ScrollbarPainter)scrollerPainter part:(WebCore::ScrollbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration
</del><ins>+- (void)setUpAlphaAnimation:(RetainPtr<WebScrollbarPartAnimation>&)scrollbarPartAnimation scrollerPainter:(NSScrollerImp *)scrollerPainter part:(WebCore::ScrollbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration
</ins><span class="cx"> {
</span><span class="cx"> // If the user has scrolled the page, then the scrollbars must be animated here.
</span><span class="cx"> // This overrides the early returns.
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(scrollerImp == scrollbarPainterForScrollbar(*_scrollbar));
</span><span class="cx">
</span><del>- ScrollbarPainter scrollerPainter = (ScrollbarPainter)scrollerImp;
</del><ins>+ NSScrollerImp *scrollerPainter = (NSScrollerImp *)scrollerImp;
</ins><span class="cx"> if (![self scrollAnimator]->scrollbarsCanBeActive()) {
</span><span class="cx"> [scrollerImp setKnobAlpha:0];
</span><span class="cx"> _scrollbar->invalidate();
</span><span class="lines">@@ -514,7 +514,7 @@
</span><span class="cx">
</span><span class="cx"> // If we are fading the scrollbar away, that is a good indication that we are no longer going to
</span><span class="cx"> // be moving it around on the scrolling thread. Calling [scrollerPainter setUsePresentationValue:NO]
</span><del>- // will pass that information on to the ScrollbarPainter API.
</del><ins>+ // will pass that information on to the NSScrollerImp API.
</ins><span class="cx"> if (newKnobAlpha == 0 && _scrollbar->supportsUpdateOnSecondaryThread())
</span><span class="cx"> [scrollerPainter setUsePresentationValue:NO];
</span><span class="cx">
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(scrollerImp == scrollbarPainterForScrollbar(*_scrollbar));
</span><span class="cx">
</span><del>- ScrollbarPainter scrollerPainter = (ScrollbarPainter)scrollerImp;
</del><ins>+ NSScrollerImp *scrollerPainter = (NSScrollerImp *)scrollerImp;
</ins><span class="cx"> [self setUpAlphaAnimation:_trackAlphaAnimation scrollerPainter:scrollerPainter part:WebCore::BackTrackPart animateAlphaTo:newTrackAlpha duration:duration];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(scrollerImp == scrollbarPainterForScrollbar(*_scrollbar));
</span><span class="cx">
</span><del>- ScrollbarPainter scrollbarPainter = (ScrollbarPainter)scrollerImp;
</del><ins>+ NSScrollerImp *scrollbarPainter = (NSScrollerImp *)scrollerImp;
</ins><span class="cx">
</span><span class="cx"> // UIStateTransition always animates to 1. In case an animation is in progress this avoids a hard transition.
</span><span class="cx"> [scrollbarPainter setUiStateTransitionProgress:1 - [scrollerImp uiStateTransitionProgress]];
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(scrollerImp == scrollbarPainterForScrollbar(*_scrollbar));
</span><span class="cx">
</span><del>- ScrollbarPainter scrollbarPainter = (ScrollbarPainter)scrollerImp;
</del><ins>+ NSScrollerImp *scrollbarPainter = (NSScrollerImp *)scrollerImp;
</ins><span class="cx">
</span><span class="cx"> // ExpansionTransition always animates to 1. In case an animation is in progress this avoids a hard transition.
</span><span class="cx"> [scrollbarPainter setExpansionTransitionProgress:1 - [scrollerImp expansionTransitionProgress]];
</span><span class="lines">@@ -626,7 +626,7 @@
</span><span class="cx"> m_scrollAnimationHelperDelegate = adoptNS([[WebScrollAnimationHelperDelegate alloc] initWithScrollAnimator:this]);
</span><span class="cx"> m_scrollAnimationHelper = adoptNS([[NSClassFromString(@"NSScrollAnimationHelper") alloc] initWithDelegate:m_scrollAnimationHelperDelegate.get()]);
</span><span class="cx">
</span><del>- m_scrollbarPainterControllerDelegate = adoptNS([[WebScrollbarPainterControllerDelegate alloc] initWithScrollableArea:&scrollableArea]);
</del><ins>+ m_scrollbarPainterControllerDelegate = adoptNS([[WebScrollerImpPairDelegate alloc] initWithScrollableArea:&scrollableArea]);
</ins><span class="cx"> m_scrollbarPainterController = adoptNS([[NSScrollerImpPair alloc] init]);
</span><span class="cx"> [m_scrollbarPainterController setDelegate:m_scrollbarPainterControllerDelegate.get()];
</span><span class="cx"> [m_scrollbarPainterController setScrollerStyle:recommendedScrollerStyle()];
</span><span class="lines">@@ -637,8 +637,8 @@
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> [m_scrollbarPainterControllerDelegate invalidate];
</span><span class="cx"> [m_scrollbarPainterController setDelegate:nil];
</span><del>- [m_horizontalScrollbarPainterDelegate invalidate];
- [m_verticalScrollbarPainterDelegate invalidate];
</del><ins>+ [m_horizontalScrollerImpDelegate invalidate];
+ [m_verticalScrollerImpDelegate invalidate];
</ins><span class="cx"> [m_scrollAnimationHelperDelegate invalidate];
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="lines">@@ -815,7 +815,7 @@
</span><span class="cx"> if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar))
</del><ins>+ if (NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar))
</ins><span class="cx"> [painter mouseEnteredScroller];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar))
</del><ins>+ if (NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar))
</ins><span class="cx"> [painter mouseExitedScroller];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -837,7 +837,7 @@
</span><span class="cx"> if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar)) {
</del><ins>+ if (NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar)) {
</ins><span class="cx"> [painter setTracking:mouseIsDown];
</span><span class="cx"> if (mouseIsDown)
</span><span class="cx"> [m_scrollbarPainterController beginScrollGesture];
</span><span class="lines">@@ -942,14 +942,14 @@
</span><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::didAddVerticalScrollbar(Scrollbar* scrollbar)
</span><span class="cx"> {
</span><del>- ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar);
</del><ins>+ NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar);
</ins><span class="cx"> if (!painter)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(!m_verticalScrollbarPainterDelegate);
- m_verticalScrollbarPainterDelegate = adoptNS([[WebScrollbarPainterDelegate alloc] initWithScrollbar:scrollbar]);
</del><ins>+ ASSERT(!m_verticalScrollerImpDelegate);
+ m_verticalScrollerImpDelegate = adoptNS([[WebScrollerImpDelegate alloc] initWithScrollbar:scrollbar]);
</ins><span class="cx">
</span><del>- [painter setDelegate:m_verticalScrollbarPainterDelegate.get()];
</del><ins>+ [painter setDelegate:m_verticalScrollerImpDelegate.get()];
</ins><span class="cx"> if (GraphicsLayer* layer = scrollbar->scrollableArea().layerForVerticalScrollbar())
</span><span class="cx"> [painter setLayer:layer->platformLayer()];
</span><span class="cx">
</span><span class="lines">@@ -960,13 +960,13 @@
</span><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::willRemoveVerticalScrollbar(Scrollbar* scrollbar)
</span><span class="cx"> {
</span><del>- ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar);
</del><ins>+ NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar);
</ins><span class="cx"> if (!painter)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(m_verticalScrollbarPainterDelegate);
- [m_verticalScrollbarPainterDelegate invalidate];
- m_verticalScrollbarPainterDelegate = nullptr;
</del><ins>+ ASSERT(m_verticalScrollerImpDelegate);
+ [m_verticalScrollerImpDelegate invalidate];
+ m_verticalScrollerImpDelegate = nullptr;
</ins><span class="cx">
</span><span class="cx"> [painter setDelegate:nil];
</span><span class="cx"> [m_scrollbarPainterController setVerticalScrollerImp:nil];
</span><span class="lines">@@ -974,14 +974,14 @@
</span><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::didAddHorizontalScrollbar(Scrollbar* scrollbar)
</span><span class="cx"> {
</span><del>- ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar);
</del><ins>+ NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar);
</ins><span class="cx"> if (!painter)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(!m_horizontalScrollbarPainterDelegate);
- m_horizontalScrollbarPainterDelegate = adoptNS([[WebScrollbarPainterDelegate alloc] initWithScrollbar:scrollbar]);
</del><ins>+ ASSERT(!m_horizontalScrollerImpDelegate);
+ m_horizontalScrollerImpDelegate = adoptNS([[WebScrollerImpDelegate alloc] initWithScrollbar:scrollbar]);
</ins><span class="cx">
</span><del>- [painter setDelegate:m_horizontalScrollbarPainterDelegate.get()];
</del><ins>+ [painter setDelegate:m_horizontalScrollerImpDelegate.get()];
</ins><span class="cx"> if (GraphicsLayer* layer = scrollbar->scrollableArea().layerForHorizontalScrollbar())
</span><span class="cx"> [painter setLayer:layer->platformLayer()];
</span><span class="cx">
</span><span class="lines">@@ -992,13 +992,13 @@
</span><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::willRemoveHorizontalScrollbar(Scrollbar* scrollbar)
</span><span class="cx"> {
</span><del>- ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar);
</del><ins>+ NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar);
</ins><span class="cx"> if (!painter)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ASSERT(m_horizontalScrollbarPainterDelegate);
- [m_horizontalScrollbarPainterDelegate invalidate];
- m_horizontalScrollbarPainterDelegate = nullptr;
</del><ins>+ ASSERT(m_horizontalScrollerImpDelegate);
+ [m_horizontalScrollerImpDelegate invalidate];
+ m_horizontalScrollerImpDelegate = nullptr;
</ins><span class="cx">
</span><span class="cx"> [painter setDelegate:nil];
</span><span class="cx"> [m_scrollbarPainterController setHorizontalScrollerImp:nil];
</span><span class="lines">@@ -1006,7 +1006,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::invalidateScrollbarPartLayers(Scrollbar* scrollbar)
</span><span class="cx"> {
</span><del>- ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar);
</del><ins>+ NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar);
</ins><span class="cx"> [painter setNeedsDisplay:YES];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1017,7 +1017,7 @@
</span><span class="cx"> if (!scrollbar)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar);
</del><ins>+ NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar);
</ins><span class="cx"> if (!painter)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1031,7 +1031,7 @@
</span><span class="cx"> if (!scrollbar)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar);
</del><ins>+ NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar);
</ins><span class="cx"> if (!painter)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1048,7 +1048,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Overlay scrollbars should participate in hit testing whenever they are at all visible.
</span><del>- ScrollbarPainter painter = scrollbarPainterForScrollbar(*scrollbar);
</del><ins>+ NSScrollerImp *painter = scrollbarPainterForScrollbar(*scrollbar);
</ins><span class="cx"> if (!painter)
</span><span class="cx"> return false;
</span><span class="cx"> return [painter knobAlpha] > 0;
</span><span class="lines">@@ -1058,7 +1058,7 @@
</span><span class="cx"> {
</span><span class="cx"> // This function is called when a page is going into the page cache, but the page
</span><span class="cx"> // isn't really scrolling in that case. We should only pass the message on to the
</span><del>- // ScrollbarPainterController when we're really scrolling on an active page.
</del><ins>+ // ScrollerImpPair when we're really scrolling on an active page.
</ins><span class="cx"> if ([m_scrollbarPainterController overlayScrollerStateIsLocked])
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1074,8 +1074,8 @@
</span><span class="cx">
</span><span class="cx"> if (scrollbarPaintTimerIsActive())
</span><span class="cx"> stopScrollbarPaintTimer();
</span><del>- [m_horizontalScrollbarPainterDelegate cancelAnimations];
- [m_verticalScrollbarPainterDelegate cancelAnimations];
</del><ins>+ [m_horizontalScrollerImpDelegate cancelAnimations];
+ [m_verticalScrollerImpDelegate cancelAnimations];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::handleWheelEventPhase(PlatformWheelEventPhase phase)
</span><span class="lines">@@ -1302,8 +1302,8 @@
</span><span class="cx"> if (Scrollbar* verticalScrollbar = scrollableArea().verticalScrollbar()) {
</span><span class="cx"> verticalScrollbar->invalidate();
</span><span class="cx">
</span><del>- ScrollbarPainter oldVerticalPainter = [m_scrollbarPainterController verticalScrollerImp];
- ScrollbarPainter newVerticalPainter = [NSScrollerImp scrollerImpWithStyle:newStyle controlSize:(NSControlSize)verticalScrollbar->controlSize() horizontal:NO replacingScrollerImp:oldVerticalPainter];
</del><ins>+ NSScrollerImp *oldVerticalPainter = [m_scrollbarPainterController verticalScrollerImp];
+ NSScrollerImp *newVerticalPainter = [NSScrollerImp scrollerImpWithStyle:newStyle controlSize:(NSControlSize)verticalScrollbar->controlSize() horizontal:NO replacingScrollerImp:oldVerticalPainter];
</ins><span class="cx">
</span><span class="cx"> [m_scrollbarPainterController setVerticalScrollerImp:newVerticalPainter];
</span><span class="cx"> macTheme->setNewPainterForScrollbar(*verticalScrollbar, newVerticalPainter);
</span><span class="lines">@@ -1318,8 +1318,8 @@
</span><span class="cx"> if (Scrollbar* horizontalScrollbar = scrollableArea().horizontalScrollbar()) {
</span><span class="cx"> horizontalScrollbar->invalidate();
</span><span class="cx">
</span><del>- ScrollbarPainter oldHorizontalPainter = [m_scrollbarPainterController horizontalScrollerImp];
- ScrollbarPainter newHorizontalPainter = [NSScrollerImp scrollerImpWithStyle:newStyle controlSize:(NSControlSize)horizontalScrollbar->controlSize() horizontal:YES replacingScrollerImp:oldHorizontalPainter];
</del><ins>+ NSScrollerImp *oldHorizontalPainter = [m_scrollbarPainterController horizontalScrollerImp];
+ NSScrollerImp *newHorizontalPainter = [NSScrollerImp scrollerImpWithStyle:newStyle controlSize:(NSControlSize)horizontalScrollbar->controlSize() horizontal:YES replacingScrollerImp:oldHorizontalPainter];
</ins><span class="cx">
</span><span class="cx"> [m_scrollbarPainterController setHorizontalScrollerImp:newHorizontalPainter];
</span><span class="cx"> macTheme->setNewPainterForScrollbar(*horizontalScrollbar, newHorizontalPainter);
</span><span class="lines">@@ -1355,7 +1355,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollAnimatorMac::initialScrollbarPaintTimerFired()
</span><span class="cx"> {
</span><del>- // To force the scrollbars to flash, we have to call hide first. Otherwise, the ScrollbarPainterController
</del><ins>+ // To force the scrollbars to flash, we have to call hide first. Otherwise, the ScrollerImpPair
</ins><span class="cx"> // might think that the scrollbars are already showing and bail early.
</span><span class="cx"> [m_scrollbarPainterController hideOverlayScrollers];
</span><span class="cx"> [m_scrollbarPainterController flashScrollers];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollbarThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -56,8 +56,8 @@
</span><span class="cx"> void registerScrollbar(Scrollbar&) override;
</span><span class="cx"> void unregisterScrollbar(Scrollbar&) override;
</span><span class="cx">
</span><del>- void setNewPainterForScrollbar(Scrollbar&, ScrollbarPainter);
- ScrollbarPainter painterForScrollbar(Scrollbar&);
</del><ins>+ void setNewPainterForScrollbar(Scrollbar&, NSScrollerImp *);
+ NSScrollerImp *painterForScrollbar(Scrollbar&);
</ins><span class="cx">
</span><span class="cx"> void setPaintCharacteristicsForScrollbar(Scrollbar&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollbarThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (198077 => 198078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-03-13 03:48:56 UTC (rev 198077)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-03-13 03:58:41 UTC (rev 198078)
</span><span class="lines">@@ -53,11 +53,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-typedef HashMap<Scrollbar*, RetainPtr<ScrollbarPainter>> ScrollbarPainterMap;
</del><ins>+typedef HashMap<Scrollbar*, RetainPtr<NSScrollerImp>> ScrollerImpMap;
</ins><span class="cx">
</span><del>-static ScrollbarPainterMap* scrollbarMap()
</del><ins>+static ScrollerImpMap* scrollbarMap()
</ins><span class="cx"> {
</span><del>- static ScrollbarPainterMap* map = new ScrollbarPainterMap;
</del><ins>+ static ScrollerImpMap* map = new ScrollerImpMap;
</ins><span class="cx"> return map;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx"> static_cast<ScrollbarThemeMac&>(theme).preferencesChanged();
</span><span class="cx"> if (scrollbarMap()->isEmpty())
</span><span class="cx"> return;
</span><del>- ScrollbarPainterMap::iterator end = scrollbarMap()->end();
- for (ScrollbarPainterMap::iterator it = scrollbarMap()->begin(); it != end; ++it) {
</del><ins>+ ScrollerImpMap::iterator end = scrollbarMap()->end();
+ for (ScrollerImpMap::iterator it = scrollbarMap()->begin(); it != end; ++it) {
</ins><span class="cx"> it->key->styleChanged();
</span><span class="cx"> it->key->invalidate();
</span><span class="cx"> }
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool isHorizontal = scrollbar.orientation() == HorizontalScrollbar;
</span><del>- ScrollbarPainter scrollbarPainter = [NSScrollerImp scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(scrollbar.controlSize()) horizontal:isHorizontal replacingScrollerImp:nil];
</del><ins>+ NSScrollerImp *scrollbarPainter = [NSScrollerImp scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(scrollbar.controlSize()) horizontal:isHorizontal replacingScrollerImp:nil];
</ins><span class="cx"> scrollbarMap()->add(&scrollbar, scrollbarPainter);
</span><span class="cx"> updateEnabledState(scrollbar);
</span><span class="cx"> updateScrollbarOverlayStyle(scrollbar);
</span><span class="lines">@@ -169,14 +169,14 @@
</span><span class="cx"> scrollbarMap()->remove(&scrollbar);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollbarThemeMac::setNewPainterForScrollbar(Scrollbar& scrollbar, ScrollbarPainter newPainter)
</del><ins>+void ScrollbarThemeMac::setNewPainterForScrollbar(Scrollbar& scrollbar, NSScrollerImp *newPainter)
</ins><span class="cx"> {
</span><span class="cx"> scrollbarMap()->set(&scrollbar, newPainter);
</span><span class="cx"> updateEnabledState(scrollbar);
</span><span class="cx"> updateScrollbarOverlayStyle(scrollbar);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ScrollbarPainter ScrollbarThemeMac::painterForScrollbar(Scrollbar& scrollbar)
</del><ins>+NSScrollerImp *ScrollbarThemeMac::painterForScrollbar(Scrollbar& scrollbar)
</ins><span class="cx"> {
</span><span class="cx"> return scrollbarMap()->get(&scrollbar).get();
</span><span class="cx"> }
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> int ScrollbarThemeMac::scrollbarThickness(ScrollbarControlSize controlSize)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>- ScrollbarPainter scrollbarPainter = [NSScrollerImp scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(controlSize) horizontal:NO replacingScrollerImp:nil];
</del><ins>+ NSScrollerImp *scrollbarPainter = [NSScrollerImp scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(controlSize) horizontal:NO replacingScrollerImp:nil];
</ins><span class="cx"> [scrollbarPainter setExpanded:YES];
</span><span class="cx"> return [scrollbarPainter trackBoxWidth];
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> void ScrollbarThemeMac::updateScrollbarOverlayStyle(Scrollbar& scrollbar)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>- ScrollbarPainter painter = painterForScrollbar(scrollbar);
</del><ins>+ NSScrollerImp *painter = painterForScrollbar(scrollbar);
</ins><span class="cx"> switch (scrollbar.scrollableArea().scrollbarOverlayStyle()) {
</span><span class="cx"> case ScrollbarOverlayStyleDefault:
</span><span class="cx"> [painter setKnobStyle:NSScrollerKnobStyleDefault];
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> {
</span><span class="cx"> int minLengthForThumb;
</span><span class="cx">
</span><del>- ScrollbarPainter painter = scrollbarMap()->get(&scrollbar).get();
</del><ins>+ NSScrollerImp *painter = scrollbarMap()->get(&scrollbar).get();
</ins><span class="cx"> minLengthForThumb = [painter knobMinLength] + [painter trackOverlapEndInset] + [painter knobOverlapEndInset]
</span><span class="cx"> + 2 * ([painter trackEndInset] + [painter knobEndInset]);
</span><span class="cx">
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> void ScrollbarThemeMac::setPaintCharacteristicsForScrollbar(Scrollbar& scrollbar)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>- ScrollbarPainter painter = painterForScrollbar(scrollbar);
</del><ins>+ NSScrollerImp *painter = painterForScrollbar(scrollbar);
</ins><span class="cx">
</span><span class="cx"> float value;
</span><span class="cx"> float overhang;
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void scrollbarPainterPaint(ScrollbarPainter scrollbarPainter, bool enabled)
</del><ins>+static void scrollbarPainterPaint(NSScrollerImp *scrollbarPainter, bool enabled)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> // Use rectForPart: here; it will take the expansion transition progress into account.
</span></span></pre>
</div>
</div>
</body>
</html>