<!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>[194515] trunk/Source</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/194515">194515</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-03 11:50:51 -0800 (Sun, 03 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation)
https://bugs.webkit.org/show_bug.cgi?id=152666
Reviewed by Dan Bernstein.
Scrollbar values take offsets (zero-based), so rename the accessor used
by scrollbars to set their value, and pass in an orientation, rather than
a pointer to the scrollbar.
Source/WebCore:
* platform/ScrollView.cpp:
(WebCore::ScrollView::scrollOffset): Use scrollOffsetFromPosition rather than
manually adding scrollOrigin.
(WebCore::ScrollView::scrollPosition): Renamed.
* platform/ScrollView.h:
(WebCore::ScrollView::cachedScrollPosition):
* platform/ScrollableArea.h:
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::Scrollbar):
(WebCore::Scrollbar::offsetDidChange):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollOffset):
(WebCore::RenderLayer::scrollPosition): Renamed.
* rendering/RenderLayer.h:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::scrollOffset):
(WebCore::RenderListBox::scrollPosition): Renamed.
* rendering/RenderListBox.h:
Source/WebKit2:
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
(WebKit::PDFPlugin::scrollOffset):
(WebKit::PDFPlugin::scrollPosition): Renamed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.cpp</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>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebCore/ChangeLog 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2016-01-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation)
+ https://bugs.webkit.org/show_bug.cgi?id=152666
+
+ Reviewed by Dan Bernstein.
+
+ Scrollbar values take offsets (zero-based), so rename the accessor used
+ by scrollbars to set their value, and pass in an orientation, rather than
+ a pointer to the scrollbar.
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::scrollOffset): Use scrollOffsetFromPosition rather than
+ manually adding scrollOrigin.
+ (WebCore::ScrollView::scrollPosition): Renamed.
+ * platform/ScrollView.h:
+ (WebCore::ScrollView::cachedScrollPosition):
+ * platform/ScrollableArea.h:
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::Scrollbar):
+ (WebCore::Scrollbar::offsetDidChange):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollOffset):
+ (WebCore::RenderLayer::scrollPosition): Renamed.
+ * rendering/RenderLayer.h:
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::scrollOffset):
+ (WebCore::RenderListBox::scrollPosition): Renamed.
+ * rendering/RenderListBox.h:
+
+2016-01-03 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> scrollLeft returns different values for viewport and non-viewport scrolling with rtl
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=94405
</span><span class="cx"> rdar://problem/21829754
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -508,12 +508,16 @@
</span><span class="cx"> updateCompositingLayersAfterScrolling();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int ScrollView::scrollPosition(Scrollbar* scrollbar) const
</del><ins>+int ScrollView::scrollOffset(ScrollbarOrientation orientation) const
</ins><span class="cx"> {
</span><del>- if (scrollbar->orientation() == HorizontalScrollbar)
- return scrollPosition().x() + scrollOrigin().x();
- if (scrollbar->orientation() == VerticalScrollbar)
- return scrollPosition().y() + scrollOrigin().y();
</del><ins>+ ScrollOffset offset = scrollOffsetFromPosition(scrollPosition());
+
+ if (orientation == HorizontalScrollbar)
+ return offset.x();
+
+ if (orientation == VerticalScrollbar)
+ return offset.y();
+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebCore/platform/ScrollView.h 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> // ScrollableArea functions.
</span><span class="cx"> virtual int scrollSize(ScrollbarOrientation) const override;
</span><del>- virtual int scrollPosition(Scrollbar*) const override;
</del><ins>+ virtual int scrollOffset(ScrollbarOrientation) const override;
</ins><span class="cx"> WEBCORE_EXPORT virtual void setScrollOffset(const ScrollOffset&) override;
</span><span class="cx"> virtual bool isScrollCornerVisible() const override;
</span><span class="cx"> virtual void scrollbarStyleChanged(ScrollbarStyle, bool forceUpdate) override;
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> virtual IntSize overhangAmount() const override;
</span><span class="cx">
</span><span class="cx"> void cacheCurrentScrollPosition() { m_cachedScrollPosition = scrollPosition(); }
</span><del>- IntPoint cachedScrollPosition() const { return m_cachedScrollPosition; }
</del><ins>+ ScrollPosition cachedScrollPosition() const { return m_cachedScrollPosition; }
</ins><span class="cx">
</span><span class="cx"> // Functions for scrolling the view.
</span><span class="cx"> virtual void setScrollPosition(const ScrollPosition&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isActive() const = 0;
</span><span class="cx"> virtual int scrollSize(ScrollbarOrientation) const = 0;
</span><del>- virtual int scrollPosition(Scrollbar*) const = 0;
</del><ins>+ virtual int scrollOffset(ScrollbarOrientation) const = 0;
</ins><span class="cx"> WEBCORE_EXPORT virtual void invalidateScrollbar(Scrollbar*, const IntRect&);
</span><span class="cx"> virtual bool isScrollCornerVisible() const = 0;
</span><span class="cx"> virtual IntRect scrollCornerRect() const = 0;
</span><span class="lines">@@ -281,10 +281,10 @@
</span><span class="cx"> void serviceScrollAnimations();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- bool isHorizontalScrollerPinnedToMinimumPosition() const { return !horizontalScrollbar() || scrollPosition(horizontalScrollbar()) <= minimumScrollPosition().x(); }
- bool isHorizontalScrollerPinnedToMaximumPosition() const { return !horizontalScrollbar() || scrollPosition(horizontalScrollbar()) >= maximumScrollPosition().x(); }
- bool isVerticalScrollerPinnedToMinimumPosition() const { return !verticalScrollbar() || scrollPosition(verticalScrollbar()) <= minimumScrollPosition().y(); }
- bool isVerticalScrollerPinnedToMaximumPosition() const { return !verticalScrollbar() || scrollPosition(verticalScrollbar()) >= maximumScrollPosition().y(); }
</del><ins>+ bool isHorizontalScrollerPinnedToMinimumPosition() const { return !horizontalScrollbar() || scrollOffset(HorizontalScrollbar) <= 0; }
+ bool isHorizontalScrollerPinnedToMaximumPosition() const { return !horizontalScrollbar() || scrollOffset(HorizontalScrollbar) >= maximumScrollOffset().x(); }
+ bool isVerticalScrollerPinnedToMinimumPosition() const { return !verticalScrollbar() || scrollOffset(VerticalScrollbar) <= 0; }
+ bool isVerticalScrollerPinnedToMaximumPosition() const { return !verticalScrollbar() || scrollOffset(VerticalScrollbar) >= maximumScrollOffset().y(); }
</ins><span class="cx">
</span><span class="cx"> bool isPinnedInBothDirections(const IntSize&) const;
</span><span class="cx"> bool isPinnedHorizontallyInDirection(int horizontalScrollDelta) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> int thickness = theme().scrollbarThickness(controlSize);
</span><span class="cx"> Widget::setFrameRect(IntRect(0, 0, thickness, thickness));
</span><span class="cx">
</span><del>- m_currentPos = static_cast<float>(m_scrollableArea.scrollPosition(this));
</del><ins>+ m_currentPos = static_cast<float>(m_scrollableArea.scrollOffset(m_orientation));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Scrollbar::~Scrollbar()
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> void Scrollbar::offsetDidChange()
</span><span class="cx"> {
</span><del>- float position = static_cast<float>(m_scrollableArea.scrollPosition(this));
</del><ins>+ float position = static_cast<float>(m_scrollableArea.scrollOffset(m_orientation));
</ins><span class="cx"> if (position == m_currentPos)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -2735,12 +2735,14 @@
</span><span class="cx"> scrollTo(scrollPositionFromOffset(offset));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderLayer::scrollPosition(Scrollbar* scrollbar) const
</del><ins>+int RenderLayer::scrollOffset(ScrollbarOrientation orientation) const
</ins><span class="cx"> {
</span><del>- if (scrollbar->orientation() == HorizontalScrollbar)
</del><ins>+ if (orientation == HorizontalScrollbar)
</ins><span class="cx"> return scrollOffset().x();
</span><del>- if (scrollbar->orientation() == VerticalScrollbar)
</del><ins>+
+ if (orientation == VerticalScrollbar)
</ins><span class="cx"> return scrollOffset().y();
</span><ins>+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -855,7 +855,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldBeSelfPaintingLayer() const;
</span><span class="cx">
</span><del>- virtual int scrollPosition(Scrollbar*) const override;
</del><ins>+ virtual int scrollOffset(ScrollbarOrientation) const override;
</ins><span class="cx">
</span><span class="cx"> // ScrollableArea interface
</span><span class="cx"> virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx"> return ((orientation == VerticalScrollbar) && m_vBar) ? (m_vBar->totalSize() - m_vBar->visibleSize()) : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderListBox::scrollPosition(Scrollbar*) const
</del><ins>+int RenderListBox::scrollOffset(ScrollbarOrientation) const
</ins><span class="cx"> {
</span><span class="cx"> return m_indexOffset;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> // ScrollableArea interface.
</span><span class="cx"> virtual int scrollSize(ScrollbarOrientation) const override;
</span><del>- virtual int scrollPosition(Scrollbar*) const override;
</del><ins>+ virtual int scrollOffset(ScrollbarOrientation) const override;
</ins><span class="cx"> virtual void setScrollOffset(const ScrollOffset&) override;
</span><span class="cx"> virtual ScrollPosition minimumScrollPosition() const override;
</span><span class="cx"> virtual ScrollPosition maximumScrollPosition() const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-03 Simon Fraser <simon.fraser@apple.com>
+
+ Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation)
+ https://bugs.webkit.org/show_bug.cgi?id=152666
+
+ Reviewed by Dan Bernstein.
+
+ Scrollbar values take offsets (zero-based), so rename the accessor used
+ by scrollbars to set their value, and pass in an orientation, rather than
+ a pointer to the scrollbar.
+
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
+ (WebKit::PDFPlugin::scrollOffset):
+ (WebKit::PDFPlugin::scrollPosition): Renamed.
+
</ins><span class="cx"> 2015-12-31 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace WTF::move with WTFMove
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> virtual int scrollSize(WebCore::ScrollbarOrientation) const override;
</span><span class="cx"> virtual bool isActive() const override;
</span><span class="cx"> virtual bool isScrollCornerVisible() const override { return false; }
</span><del>- virtual int scrollPosition(WebCore::Scrollbar*) const override;
</del><ins>+ virtual int scrollOffset(WebCore::ScrollbarOrientation) const override;
</ins><span class="cx"> virtual WebCore::ScrollPosition scrollPosition() const override;
</span><span class="cx"> virtual WebCore::ScrollPosition minimumScrollPosition() const override;
</span><span class="cx"> virtual WebCore::ScrollPosition maximumScrollPosition() const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (194514 => 194515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-01-03 18:06:50 UTC (rev 194514)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-01-03 19:50:51 UTC (rev 194515)
</span><span class="lines">@@ -773,12 +773,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int PDFPlugin::scrollPosition(Scrollbar* scrollbar) const
</del><ins>+int PDFPlugin::scrollOffset(ScrollbarOrientation orientation) const
</ins><span class="cx"> {
</span><del>- if (scrollbar->orientation() == HorizontalScrollbar)
</del><ins>+ if (orientation == HorizontalScrollbar)
</ins><span class="cx"> return m_scrollOffset.width();
</span><del>- if (scrollbar->orientation() == VerticalScrollbar)
</del><ins>+
+ if (orientation == VerticalScrollbar)
</ins><span class="cx"> return m_scrollOffset.height();
</span><ins>+
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>