<!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>[194457] 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/194457">194457</a></dd>

<dt>Author</dt> <dd>simon.fraser@apple.com</dd>

<dt>Date</dt> <dd>2015-12-31 10:50:10 -0800 (Thu, 31 Dec 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Change ScrollView::scrollTo() to take a ScrollPosition

https://bugs.webkit.org/show_bug.cgi?id=152607

Reviewed by Zalan Bujtas.

Make it more explicit that ScrollView::scrollTo() takes a ScrollPosition, and

change the name and type of the m_scrollOffset member variable.

* page/FrameView.cpp:

(WebCore::FrameView::scrollTo):

(WebCore::FrameView::wheelEvent):

* page/FrameView.h:

* platform/ScrollView.cpp:

(WebCore::ScrollView::unobscuredContentRectInternal):

(WebCore::ScrollView::setScrollOffset):

(WebCore::ScrollView::scrollTo):

* platform/ScrollView.h:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>

<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>

<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>

<li><a href="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>

<li><a href="#trunkSourceWebCoreplatformiosScrollViewIOSmm">trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194456 => 194457)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-12-31 18:50:09 UTC (rev 194456)

+++ trunk/Source/WebCore/ChangeLog        2015-12-31 18:50:10 UTC (rev 194457)

</span><span class="lines">@@ -1,3 +1,23 @@

</span><ins>+2015-12-30  Simon Fraser  &lt;simon.fraser@apple.com&gt;

+

+        Change ScrollView::scrollTo() to take a ScrollPosition

+        https://bugs.webkit.org/show_bug.cgi?id=152607

+

+        Reviewed by Zalan Bujtas.

+

+        Make it more explicit that ScrollView::scrollTo() takes a ScrollPosition, and

+        change the name and type of the m_scrollOffset member variable.

+

+        * page/FrameView.cpp:

+        (WebCore::FrameView::scrollTo):

+        (WebCore::FrameView::wheelEvent):

+        * page/FrameView.h:

+        * platform/ScrollView.cpp:

+        (WebCore::ScrollView::unobscuredContentRectInternal):

+        (WebCore::ScrollView::setScrollOffset):

+        (WebCore::ScrollView::scrollTo):

+        * platform/ScrollView.h:

+

</ins><span class="cx"> 2015-12-30  Brady Eidson  &lt;beidson@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Modern IDB: Only fire blocked events after all open connections have handled their versionchange events.

</span></span></pre></div>

<a id="trunkSourceWebCorepageFrameViewcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (194456 => 194457)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp        2015-12-31 18:50:09 UTC (rev 194456)

+++ trunk/Source/WebCore/page/FrameView.cpp        2015-12-31 18:50:10 UTC (rev 194457)

</span><span class="lines">@@ -3474,10 +3474,10 @@

</span><span class="cx">     return page &amp;&amp; page-&gt;settings().forceUpdateScrollbarsOnMainThreadForPerformanceTesting();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void FrameView::scrollTo(const IntSize&amp; newOffset)

</del><ins>+void FrameView::scrollTo(const ScrollPosition&amp; newPosition)

</ins><span class="cx"> {

</span><span class="cx">     IntPoint oldPosition = scrollPosition();

</span><del>-    ScrollView::scrollTo(newOffset);

</del><ins>+    ScrollView::scrollTo(newPosition);

</ins><span class="cx">     if (oldPosition != scrollPosition())

</span><span class="cx">         scrollPositionChanged(oldPosition, scrollPosition());

</span><span class="cx">     didChangeScrollOffset();

</span><span class="lines">@@ -4586,7 +4586,7 @@

</span><span class="cx">         ScrollPosition oldPosition = scrollPosition();

</span><span class="cx">         ScrollPosition newPosition = oldPosition - IntSize(wheelEvent.deltaX(), wheelEvent.deltaY());

</span><span class="cx">         if (oldPosition != newPosition) {

</span><del>-            ScrollView::scrollTo(toIntSize(newPosition));

</del><ins>+            ScrollView::scrollTo(newPosition);

</ins><span class="cx">             scrollPositionChanged(oldPosition, scrollPosition());

</span><span class="cx">             didChangeScrollOffset();

</span><span class="cx">         }

</span></span></pre></div>

<a id="trunkSourceWebCorepageFrameViewh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (194456 => 194457)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/page/FrameView.h        2015-12-31 18:50:09 UTC (rev 194456)

+++ trunk/Source/WebCore/page/FrameView.h        2015-12-31 18:50:10 UTC (rev 194457)

</span><span class="lines">@@ -624,7 +624,7 @@

</span><span class="cx"> 

</span><span class="cx">     // ScrollableArea interface

</span><span class="cx">     virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&amp;) override;

</span><del>-    virtual void scrollTo(const IntSize&amp;) override;

</del><ins>+    virtual void scrollTo(const ScrollPosition&amp;) override;

</ins><span class="cx">     virtual void setVisibleScrollerThumbRect(const IntRect&amp;) override;

</span><span class="cx">     virtual ScrollableArea* enclosingScrollableArea() const override;

</span><span class="cx">     virtual IntRect scrollableAreaBoundingBox(bool* = nullptr) const override;

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (194456 => 194457)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp        2015-12-31 18:50:09 UTC (rev 194456)

+++ trunk/Source/WebCore/platform/ScrollView.cpp        2015-12-31 18:50:10 UTC (rev 194457)

</span><span class="lines">@@ -264,7 +264,7 @@

</span><span class="cx"> {

</span><span class="cx">     FloatSize visibleContentSize = unscaledUnobscuredVisibleContentSize(scrollbarInclusion);

</span><span class="cx">     visibleContentSize.scale(1 / visibleContentScaleFactor());

</span><del>-    return IntRect(IntPoint(m_scrollOffset), expandedIntSize(visibleContentSize));

</del><ins>+    return IntRect(m_scrollPosition, expandedIntSize(visibleContentSize));

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> IntSize ScrollView::unscaledVisibleContentSizeIncludingObscuredArea(VisibleContentRectIncludesScrollbars scrollbarInclusion) const

</span><span class="lines">@@ -441,8 +441,7 @@

</span><span class="cx">     if (constrainsScrollingToContentEdge())

</span><span class="cx">         constrainedOffset = constrainedOffset.constrainedBetween(IntPoint(), maximumScrollOffset());

</span><span class="cx"> 

</span><del>-    ScrollPosition newPosition = scrollPositionFromOffset(constrainedOffset);

-    scrollTo(toIntSize(newPosition));

</del><ins>+    scrollTo(scrollPositionFromOffset(constrainedOffset));

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void ScrollView::scrollPositionChangedViaPlatformWidget(const IntPoint&amp; oldPosition, const IntPoint&amp; newPosition)

</span><span class="lines">@@ -476,19 +475,20 @@

</span><span class="cx">     m_deferredScrollPositions = nullptr;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void ScrollView::scrollTo(const IntSize&amp; newOffset)

</del><ins>+void ScrollView::scrollTo(const ScrollPosition&amp; newPosition)

</ins><span class="cx"> {

</span><del>-    IntSize scrollDelta = newOffset - m_scrollOffset;

</del><ins>+    IntSize scrollDelta = newPosition - m_scrollPosition;

</ins><span class="cx">     if (scrollDelta.isZero())

</span><span class="cx">         return;

</span><del>-    m_scrollOffset = newOffset;

</del><span class="cx"> 

</span><ins>+    m_scrollPosition = newPosition;

+

</ins><span class="cx">     if (scrollbarsSuppressed())

</span><span class="cx">         return;

</span><span class="cx"> 

</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)

</span><span class="cx">     if (delegatesScrolling()) {

</span><del>-        requestScrollPositionUpdate(IntPoint(newOffset));

</del><ins>+        requestScrollPositionUpdate(newPosition);

</ins><span class="cx">         return;

</span><span class="cx">     }

</span><span class="cx"> #endif

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformScrollViewh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (194456 => 194457)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h        2015-12-31 18:50:09 UTC (rev 194456)

+++ trunk/Source/WebCore/platform/ScrollView.h        2015-12-31 18:50:10 UTC (rev 194457)

</span><span class="lines">@@ -74,7 +74,7 @@

</span><span class="cx">     virtual void notifyPageThatContentAreaWillPaint() const;

</span><span class="cx"> 

<span class="cx">     // NOTE: This should only be called by the overriden setScrollOffset from ScrollableArea.

</span><del>-    virtual void scrollTo(const IntSize&amp; newOffset);

</del><ins>+    virtual void scrollTo(const ScrollPosition&amp;);

</ins><span class="cx"> 

</span><span class="cx">     // The window thats hosts the ScrollView. The ScrollView will communicate scrolls and repaints to the

<span class="cx">     // host window in the window's coordinate space.

</span><span class="lines">@@ -450,7 +450,7 @@

</span><span class="cx"> #else

</span><span class="cx">     IntRect m_fixedVisibleContentRect;

</span><span class="cx"> #endif

<del>-    IntSize m_scrollOffset; // FIXME: Would rather store this as a position, but we will wait to make this change until more code is shared.

</del><ins>+    ScrollPosition m_scrollPosition;

</ins><span class="cx">     IntPoint m_cachedScrollPosition;

</span><span class="cx">     IntSize m_fixedLayoutSize;

</span><span class="cx">     IntSize m_contentsSize;

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformiosScrollViewIOSmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (194456 => 194457)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm        2015-12-31 18:50:09 UTC (rev 194456)

+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm        2015-12-31 18:50:10 UTC (rev 194457)

</span><span class="lines">@@ -108,8 +108,8 @@

</span><span class="cx">     }

</span><span class="cx"> 

</span><span class="cx">     if (!m_unobscuredContentSize.isEmpty()) {

<del>-        // FIXME: is this correct in RTL documents?

-        return IntRect(scrollOrigin() + m_scrollOffset, roundedIntSize(m_unobscuredContentSize));

</del><ins>+        // FIXME: This seems wrong but gives the right answer, probably because m_scrollPosition is wrong.

+        return IntRect(m_scrollPosition + scrollOrigin(), roundedIntSize(m_unobscuredContentSize));

</ins><span class="cx">     }

</span><span class="cx"> 

</span><span class="cx">     return unobscuredContentRectInternal();

</span></span></pre>

</div>

</div>

</body>

</html>