<!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>[194478] 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/194478">194478</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-12-31 23:53:30 -0800 (Thu, 31 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change RenderLayer::scrollTo() to take a ScrollPosition
https://bugs.webkit.org/show_bug.cgi?id=152633
Reviewed by Zalan Bujtas.
RenderLayer::scrollTo() took x and y offsets. Change this to take a position,
like ScrollView::scrollTo() and fix the one caller.
Preserve the dubious behavior of the adjustForIOSCaretWhenScrolling() code by converting
to and from offsets, even though testing suggests that this code can just be removed,
even with an extra wide caret for testing.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollTo):
(WebCore::RenderLayer::setScrollOffset):
* rendering/RenderLayer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194477 => 194478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-01 03:17:31 UTC (rev 194477)
+++ trunk/Source/WebCore/ChangeLog 2016-01-01 07:53:30 UTC (rev 194478)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-12-31 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Change RenderLayer::scrollTo() to take a ScrollPosition
+ https://bugs.webkit.org/show_bug.cgi?id=152633
+
+ Reviewed by Zalan Bujtas.
+
+ RenderLayer::scrollTo() took x and y offsets. Change this to take a position,
+ like ScrollView::scrollTo() and fix the one caller.
+
+ Preserve the dubious behavior of the adjustForIOSCaretWhenScrolling() code by converting
+ to and from offsets, even though testing suggests that this code can just be removed,
+ even with an extra wide caret for testing.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollTo):
+ (WebCore::RenderLayer::setScrollOffset):
+ * rendering/RenderLayer.h:
+
+2015-12-31 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Rename documentScrollOffsetRelativeTo* functions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152632
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (194477 => 194478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-01 03:17:31 UTC (rev 194477)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-01 07:53:30 UTC (rev 194478)
</span><span class="lines">@@ -2326,38 +2326,37 @@
</span><span class="cx"> scrollToOffsetWithoutAnimation(newScrollOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// x and y are scroll offset values
-// FIXME: use a ScrollOffset, or change this to take a ScrollPosition.
-void RenderLayer::scrollTo(int x, int y)
</del><ins>+void RenderLayer::scrollTo(const ScrollPosition& position)
</ins><span class="cx"> {
</span><span class="cx"> RenderBox* box = renderBox();
</span><span class="cx"> if (!box)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ ScrollPosition newPosition = position;
</ins><span class="cx"> if (box->style().overflowX() != OMARQUEE) {
</span><span class="cx"> // Ensure that the dimensions will be computed if they need to be (for overflow:hidden blocks).
</span><span class="cx"> if (m_scrollDimensionsDirty)
</span><span class="cx"> computeScrollDimensions();
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (adjustForIOSCaretWhenScrolling()) {
</span><del>- int maxX = scrollWidth() - box->clientWidth();
- if (x > maxX - caretWidth) {
- x += caretWidth;
- if (x <= caretWidth)
- x = 0;
- } else if (x < m_scrollPosition.x() - caretWidth)
- x -= caretWidth;
</del><ins>+ // FIXME: It's not clear what this code is trying to do. Behavior seems reasonable with it removed.
+ int maxOffset = scrollWidth() - box->clientWidth();
+ ScrollOffset newOffset = scrollOffsetFromPosition(newPosition);
+ int scrollXOffset = newOffset.x();
+ if (scrollXOffset > maxOffset - caretWidth) {
+ scrollXOffset += caretWidth;
+ if (scrollXOffset <= caretWidth)
+ scrollXOffset = 0;
+ } else if (scrollXOffset < m_scrollPosition.x() - caretWidth)
+ scrollXOffset -= caretWidth;
+
+ newOffset.setX(scrollXOffset);
+ newPosition = scrollPositionFromOffset(newOffset);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: Eventually, we will want to perform a blit. For now never
- // blit, since the check for blitting is going to be very
- // complicated (since it will involve testing whether our layer
- // is either occluded by another layer or clipped by an enclosing
- // layer or contains fixed backgrounds, etc.).
- ScrollPosition newScrollPosition = scrollPositionFromOffset(ScrollOffset(x, y));
- if (m_scrollPosition == newScrollPosition) {
</del><ins>+ if (m_scrollPosition == newPosition) {
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (m_requiresScrollBoundsOriginUpdate)
</span><span class="cx"> updateCompositingLayersAfterScroll();
</span><span class="lines">@@ -2366,7 +2365,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollPosition oldPosition = IntPoint(m_scrollPosition);
</span><del>- m_scrollPosition = newScrollPosition;
</del><ins>+ m_scrollPosition = newPosition;
</ins><span class="cx">
</span><span class="cx"> RenderView& view = renderer().view();
</span><span class="cx">
</span><span class="lines">@@ -2417,7 +2416,7 @@
</span><span class="cx"> // Schedule the scroll and scroll-related DOM events.
</span><span class="cx"> if (Element* element = renderer().element()) {
</span><span class="cx"> element->document().eventQueue().enqueueOrDispatchScrollEvent(*element);
</span><del>- element->document().sendWillRevealEdgeEventsIfNeeded(oldPosition, newScrollPosition, visibleContentRect(), contentsSize(), element);
</del><ins>+ element->document().sendWillRevealEdgeEventsIfNeeded(oldPosition, newPosition, visibleContentRect(), contentsSize(), element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (scrollsOverflow())
</span><span class="lines">@@ -2719,9 +2718,9 @@
</span><span class="cx"> return scrollbar ? (scrollbar->totalSize() - scrollbar->visibleSize()) : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::setScrollOffset(const IntPoint& offset)
</del><ins>+void RenderLayer::setScrollOffset(const ScrollOffset& offset)
</ins><span class="cx"> {
</span><del>- scrollTo(offset.x(), offset.y());
</del><ins>+ scrollTo(scrollPositionFromOffset(offset));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderLayer::scrollPosition(Scrollbar* scrollbar) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (194477 => 194478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2016-01-01 03:17:31 UTC (rev 194477)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2016-01-01 07:53:30 UTC (rev 194478)
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, const IntPoint&) const override;
</span><span class="cx"> virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, const IntPoint&) const override;
</span><span class="cx"> virtual int scrollSize(ScrollbarOrientation) const override;
</span><del>- virtual void setScrollOffset(const IntPoint&) override;
</del><ins>+ virtual void setScrollOffset(const ScrollOffset&) override;
</ins><span class="cx">
</span><span class="cx"> virtual ScrollPosition scrollPosition() const override { return m_scrollPosition; }
</span><span class="cx"> virtual ScrollPosition maximumScrollPosition() const override;
</span><span class="lines">@@ -892,7 +892,7 @@
</span><span class="cx"> LayoutRect scrollCornerAndResizerRect() const;
</span><span class="cx">
</span><span class="cx"> // NOTE: This should only be called by the overriden setScrollOffset from ScrollableArea.
</span><del>- void scrollTo(int, int);
</del><ins>+ void scrollTo(const ScrollPosition&);
</ins><span class="cx"> void updateCompositingLayersAfterScroll();
</span><span class="cx">
</span><span class="cx"> IntSize scrollbarOffset(const Scrollbar*) const;
</span></span></pre>
</div>
</div>
</body>
</html>