<!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>[198817] 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/198817">198817</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-03-29 18:24:50 -0700 (Tue, 29 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/198784">r198784</a>) Shouldn't add platform-dependent code to ScrollableArea.h
https://bugs.webkit.org/show_bug.cgi?id=155999
Rolling out the patch.
* platform/ScrollableArea.h:
(WebCore::ScrollableArea::horizontalScrollbar):
(WebCore::ScrollableArea::verticalScrollbar):
(WebCore::ScrollableArea::tiledBacking):
(WebCore::ScrollableArea::layerForHorizontalScrollbar):
(WebCore::ScrollableArea::layerForVerticalScrollbar):
(WebCore::ScrollableArea::layerForScrolling):
(WebCore::ScrollableArea::layerForScrollCorner):
(WebCore::ScrollableArea::layerForOverhangAreas):
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::updateScrollerStyle): Deleted.
* platform/mac/ScrollableAreaMac.mm:
(WebCore::ScrollableArea::setScrollbarLayoutDirection): Deleted.
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::registerScrollbar): Deleted.
* platform/spi/mac/NSScrollerImpSPI.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollableAreaMacmm">trunk/Source/WebCore/platform/mac/ScrollableAreaMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollbarThemeMacmm">trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSScrollerImpSPIh">trunk/Source/WebCore/platform/spi/mac/NSScrollerImpSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198816 => 198817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-30 00:40:28 UTC (rev 198816)
+++ trunk/Source/WebCore/ChangeLog 2016-03-30 01:24:50 UTC (rev 198817)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-03-29 Myles C. Maxfield <mmaxfield@apple.com>
+
+ REGRESSION(r198784) Shouldn't add platform-dependent code to ScrollableArea.h
+ https://bugs.webkit.org/show_bug.cgi?id=155999
+
+ Rolling out the patch.
+
+ * platform/ScrollableArea.h:
+ (WebCore::ScrollableArea::horizontalScrollbar):
+ (WebCore::ScrollableArea::verticalScrollbar):
+ (WebCore::ScrollableArea::tiledBacking):
+ (WebCore::ScrollableArea::layerForHorizontalScrollbar):
+ (WebCore::ScrollableArea::layerForVerticalScrollbar):
+ (WebCore::ScrollableArea::layerForScrolling):
+ (WebCore::ScrollableArea::layerForScrollCorner):
+ (WebCore::ScrollableArea::layerForOverhangAreas):
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::updateScrollerStyle): Deleted.
+ * platform/mac/ScrollableAreaMac.mm:
+ (WebCore::ScrollableArea::setScrollbarLayoutDirection): Deleted.
+ * platform/mac/ScrollbarThemeMac.mm:
+ (WebCore::ScrollbarThemeMac::registerScrollbar): Deleted.
+ * platform/spi/mac/NSScrollerImpSPI.h:
+
</ins><span class="cx"> 2016-03-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix Windows clean build.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (198816 => 198817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h 2016-03-30 00:40:28 UTC (rev 198816)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2016-03-30 01:24:50 UTC (rev 198817)
</span><span class="lines">@@ -29,10 +29,6 @@
</span><span class="cx"> #include "Scrollbar.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
-OBJC_CLASS NSScrollerImp;
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FloatPoint;
</span><span class="lines">@@ -184,8 +180,8 @@
</span><span class="cx"> int verticalScrollbarIntrusion() const;
</span><span class="cx"> WEBCORE_EXPORT IntSize scrollbarIntrusion() const;
</span><span class="cx">
</span><del>- virtual Scrollbar* horizontalScrollbar() const { return nullptr; }
- virtual Scrollbar* verticalScrollbar() const { return nullptr; }
</del><ins>+ virtual Scrollbar* horizontalScrollbar() const { return 0; }
+ virtual Scrollbar* verticalScrollbar() const { return 0; }
</ins><span class="cx">
</span><span class="cx"> const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
</span><span class="cx"> bool scrollOriginChanged() const { return m_scrollOriginChanged; }
</span><span class="lines">@@ -297,15 +293,15 @@
</span><span class="cx"> bool isPinnedVerticallyInDirection(int verticalScrollDelta) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual TiledBacking* tiledBacking() const { return nullptr; }
</del><ins>+ virtual TiledBacking* tiledBacking() const { return 0; }
</ins><span class="cx">
</span><span class="cx"> // True if scrolling happens by moving compositing layers.
</span><span class="cx"> virtual bool usesCompositedScrolling() const { return false; }
</span><span class="cx"> // True if the contents can be scrolled asynchronously (i.e. by a ScrollingCoordinator).
</span><span class="cx"> virtual bool usesAsyncScrolling() const { return false; }
</span><span class="cx">
</span><del>- virtual GraphicsLayer* layerForHorizontalScrollbar() const { return nullptr; }
- virtual GraphicsLayer* layerForVerticalScrollbar() const { return nullptr; }
</del><ins>+ virtual GraphicsLayer* layerForHorizontalScrollbar() const { return 0; }
+ virtual GraphicsLayer* layerForVerticalScrollbar() const { return 0; }
</ins><span class="cx">
</span><span class="cx"> bool hasLayerForHorizontalScrollbar() const;
</span><span class="cx"> bool hasLayerForVerticalScrollbar() const;
</span><span class="lines">@@ -318,9 +314,6 @@
</span><span class="cx">
</span><span class="cx"> bool verticalScrollbarIsOnLeft() const;
</span><span class="cx"> static bool systemLanguageIsRTL();
</span><del>-#if PLATFORM(COCOA)
- void setScrollbarLayoutDirection(NSScrollerImp *) const;
-#endif
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> WEBCORE_EXPORT ScrollableArea();
</span><span class="lines">@@ -334,10 +327,10 @@
</span><span class="cx"> virtual void invalidateScrollCornerRect(const IntRect&) = 0;
</span><span class="cx">
</span><span class="cx"> friend class ScrollingCoordinator;
</span><del>- virtual GraphicsLayer* layerForScrolling() const { return nullptr; }
- virtual GraphicsLayer* layerForScrollCorner() const { return nullptr; }
</del><ins>+ virtual GraphicsLayer* layerForScrolling() const { return 0; }
+ virtual GraphicsLayer* layerForScrollCorner() const { return 0; }
</ins><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- virtual GraphicsLayer* layerForOverhangAreas() const { return nullptr; }
</del><ins>+ virtual GraphicsLayer* layerForOverhangAreas() const { return 0; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool hasLayerForScrollCorner() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (198816 => 198817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2016-03-30 00:40:28 UTC (rev 198816)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2016-03-30 01:24:50 UTC (rev 198817)
</span><span class="lines">@@ -1300,7 +1300,6 @@
</span><span class="cx">
</span><span class="cx"> NSScrollerImp *oldVerticalPainter = [m_scrollerImpPair verticalScrollerImp];
</span><span class="cx"> NSScrollerImp *newVerticalPainter = [NSScrollerImp scrollerImpWithStyle:newStyle controlSize:(NSControlSize)verticalScrollbar->controlSize() horizontal:NO replacingScrollerImp:oldVerticalPainter];
</span><del>- m_scrollableArea.setScrollbarLayoutDirection(newVerticalPainter);
</del><span class="cx">
</span><span class="cx"> [m_scrollerImpPair setVerticalScrollerImp:newVerticalPainter];
</span><span class="cx"> macTheme->setNewPainterForScrollbar(*verticalScrollbar, newVerticalPainter);
</span><span class="lines">@@ -1317,7 +1316,6 @@
</span><span class="cx">
</span><span class="cx"> NSScrollerImp *oldHorizontalPainter = [m_scrollerImpPair horizontalScrollerImp];
</span><span class="cx"> NSScrollerImp *newHorizontalPainter = [NSScrollerImp scrollerImpWithStyle:newStyle controlSize:(NSControlSize)horizontalScrollbar->controlSize() horizontal:YES replacingScrollerImp:oldHorizontalPainter];
</span><del>- m_scrollableArea.setScrollbarLayoutDirection(newHorizontalPainter);
</del><span class="cx">
</span><span class="cx"> [m_scrollerImpPair setHorizontalScrollerImp:newHorizontalPainter];
</span><span class="cx"> macTheme->setNewPainterForScrollbar(*horizontalScrollbar, newHorizontalPainter);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollableAreaMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollableAreaMac.mm (198816 => 198817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollableAreaMac.mm 2016-03-30 00:40:28 UTC (rev 198816)
+++ trunk/Source/WebCore/platform/mac/ScrollableAreaMac.mm 2016-03-30 01:24:50 UTC (rev 198817)
</span><span class="lines">@@ -54,13 +54,4 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollableArea::setScrollbarLayoutDirection(NSScrollerImp *scroller) const
-{
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
- scroller.userInterfaceLayoutDirection = verticalScrollbarIsOnLeft() ? NSUserInterfaceLayoutDirectionRightToLeft : NSUserInterfaceLayoutDirectionLeftToRight;
-#else
- UNUSED_PARAM(scroller);
-#endif
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollbarThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (198816 => 198817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-03-30 00:40:28 UTC (rev 198816)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2016-03-30 01:24:50 UTC (rev 198817)
</span><span class="lines">@@ -160,7 +160,6 @@
</span><span class="cx">
</span><span class="cx"> bool isHorizontal = scrollbar.orientation() == HorizontalScrollbar;
</span><span class="cx"> NSScrollerImp *scrollerImp = [NSScrollerImp scrollerImpWithStyle:recommendedScrollerStyle() controlSize:scrollbarControlSizeToNSControlSize(scrollbar.controlSize()) horizontal:isHorizontal replacingScrollerImp:nil];
</span><del>- scrollbar.scrollableArea().setScrollbarLayoutDirection(scrollerImp);
</del><span class="cx"> scrollbarMap()->add(&scrollbar, scrollerImp);
</span><span class="cx"> updateEnabledState(scrollbar);
</span><span class="cx"> updateScrollbarOverlayStyle(scrollbar);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSScrollerImpSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSScrollerImpSPI.h (198816 => 198817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSScrollerImpSPI.h 2016-03-30 00:40:28 UTC (rev 198816)
+++ trunk/Source/WebCore/platform/spi/mac/NSScrollerImpSPI.h 2016-03-30 01:24:50 UTC (rev 198817)
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx"> @property(readonly) CGFloat knobMinLength;
</span><span class="cx"> @property(readonly) CGFloat knobOverlapEndInset;
</span><span class="cx"> @property(readonly) CGFloat trackOverlapEndInset;
</span><del>-@property NSUserInterfaceLayoutDirection userInterfaceLayoutDirection;
</del><span class="cx"> - (NSRect)rectForPart:(NSScrollerPart)partCode;
</span><span class="cx"> - (void)drawKnobSlotInRect:(NSRect)slotRect highlight:(BOOL)flag alpha:(CGFloat)alpha;
</span><span class="cx"> - (void)drawKnobSlotInRect:(NSRect)slotRect highlight:(BOOL)flag;
</span></span></pre>
</div>
</div>
</body>
</html>