<!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>[198841] 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/198841">198841</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-03-30 09:50:14 -0700 (Wed, 30 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use references instead of pointers in scrollbar-related code
https://bugs.webkit.org/show_bug.cgi?id=155998
Reviewed by Dean Jackson.
Source/WebCore:
Migrate pointers to references.
No new tests because there is no behavior change.
* page/FrameView.cpp:
(WebCore::FrameView::invalidateScrollbarRect):
(WebCore::FrameView::setVisibleScrollerThumbRect):
* page/FrameView.h:
* platform/ScrollView.cpp:
(WebCore::ScrollView::convertFromScrollbarToContainingView):
(WebCore::ScrollView::convertFromContainingViewToScrollbar):
* platform/ScrollView.h:
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::invalidateScrollbar):
* platform/ScrollableArea.h:
(WebCore::ScrollableArea::convertFromScrollbarToContainingView):
(WebCore::ScrollableArea::convertFromContainingViewToScrollbar):
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::invalidateRect):
(WebCore::Scrollbar::convertToContainingView):
(WebCore::Scrollbar::convertFromContainingView):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::convertFromScrollbarToContainingView):
(WebCore::RenderLayer::convertFromContainingViewToScrollbar):
(WebCore::RenderLayer::scrollbarOffset):
(WebCore::RenderLayer::invalidateScrollbarRect):
* rendering/RenderLayer.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::destroyRootLayer):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::invalidateScrollbarRect):
(WebCore::RenderListBox::convertFromScrollbarToContainingView):
(WebCore::RenderListBox::convertFromContainingViewToScrollbar):
* rendering/RenderListBox.h:
* platform/win/PopupMenuWin.cpp:
(WebCore::RenderListBox::invalidateScrollbarRect):
* platform/win/PopupMenuWin.h:
Source/WebKit2:
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
(WebKit::PDFPlugin::convertFromScrollbarToContainingView):
(WebKit::PDFPlugin::convertFromContainingViewToScrollbar):
(WebKit::PDFPlugin::invalidateScrollbarRect):</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="#trunkSourceWebCoreplatformScrollableAreacpp">trunk/Source/WebCore/platform/ScrollableArea.cpp</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="#trunkSourceWebCoreplatformwinPopupMenuWincpp">trunk/Source/WebCore/platform/win/PopupMenuWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWinh">trunk/Source/WebCore/platform/win/PopupMenuWin.h</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="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</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 (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/ChangeLog 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2016-03-30 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Use references instead of pointers in scrollbar-related code
+ https://bugs.webkit.org/show_bug.cgi?id=155998
+
+ Reviewed by Dean Jackson.
+
+ Migrate pointers to references.
+
+ No new tests because there is no behavior change.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::invalidateScrollbarRect):
+ (WebCore::FrameView::setVisibleScrollerThumbRect):
+ * page/FrameView.h:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::convertFromScrollbarToContainingView):
+ (WebCore::ScrollView::convertFromContainingViewToScrollbar):
+ * platform/ScrollView.h:
+ * platform/ScrollableArea.cpp:
+ (WebCore::ScrollableArea::invalidateScrollbar):
+ * platform/ScrollableArea.h:
+ (WebCore::ScrollableArea::convertFromScrollbarToContainingView):
+ (WebCore::ScrollableArea::convertFromContainingViewToScrollbar):
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::invalidateRect):
+ (WebCore::Scrollbar::convertToContainingView):
+ (WebCore::Scrollbar::convertFromContainingView):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::convertFromScrollbarToContainingView):
+ (WebCore::RenderLayer::convertFromContainingViewToScrollbar):
+ (WebCore::RenderLayer::scrollbarOffset):
+ (WebCore::RenderLayer::invalidateScrollbarRect):
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::destroyRootLayer):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::invalidateScrollbarRect):
+ (WebCore::RenderListBox::convertFromScrollbarToContainingView):
+ (WebCore::RenderListBox::convertFromContainingViewToScrollbar):
+ * rendering/RenderListBox.h:
+ * platform/win/PopupMenuWin.cpp:
+ (WebCore::RenderListBox::invalidateScrollbarRect):
+ * platform/win/PopupMenuWin.h:
+
</ins><span class="cx"> 2016-03-24 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Make animation events non-cancelable
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -3586,11 +3586,11 @@
</span><span class="cx"> return Scrollbar::pageStep(unobscuredContentRect.height(), unobscuredContentRect.height() - topObscuredArea - bottomObscuredArea);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
</del><ins>+void FrameView::invalidateScrollbarRect(Scrollbar& scrollbar, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> // Add in our offset within the FrameView.
</span><span class="cx"> IntRect dirtyRect = rect;
</span><del>- dirtyRect.moveBy(scrollbar->location());
</del><ins>+ dirtyRect.moveBy(scrollbar.location());
</ins><span class="cx"> invalidateRect(dirtyRect);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3611,11 +3611,8 @@
</span><span class="cx"> if (!frame().isMainFrame())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Page* page = frame().page();
- if (!page)
- return;
-
- page->chrome().client().notifyScrollerThumbIsVisibleInRect(scrollerThumb);
</del><ins>+ if (Page* page = frame().page())
+ page->chrome().client().notifyScrollerThumbIsVisibleInRect(scrollerThumb);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollableArea* FrameView::enclosingScrollableArea() const
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/page/FrameView.h 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx"> void delegatesScrollingDidChange() override;
</span><span class="cx">
</span><span class="cx"> // ScrollableArea interface
</span><del>- void invalidateScrollbarRect(Scrollbar*, const IntRect&) override;
</del><ins>+ void invalidateScrollbarRect(Scrollbar&, const IntRect&) override;
</ins><span class="cx"> void scrollTo(const ScrollPosition&) override;
</span><span class="cx"> void setVisibleScrollerThumbRect(const IntRect&) override;
</span><span class="cx"> ScrollableArea* enclosingScrollableArea() const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -1364,36 +1364,36 @@
</span><span class="cx"> || (m_verticalScrollbar && height() - m_verticalScrollbar->height() > 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect ScrollView::convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntRect& localRect) const
</del><ins>+IntRect ScrollView::convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntRect& localRect) const
</ins><span class="cx"> {
</span><span class="cx"> // Scrollbars won't be transformed within us
</span><span class="cx"> IntRect newRect = localRect;
</span><del>- newRect.moveBy(scrollbar->location());
</del><ins>+ newRect.moveBy(scrollbar.location());
</ins><span class="cx"> return newRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect ScrollView::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
</del><ins>+IntRect ScrollView::convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntRect& parentRect) const
</ins><span class="cx"> {
</span><span class="cx"> IntRect newRect = parentRect;
</span><span class="cx"> // Scrollbars won't be transformed within us
</span><del>- newRect.moveBy(-scrollbar->location());
</del><ins>+ newRect.moveBy(-scrollbar.location());
</ins><span class="cx"> return newRect;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: test these on windows
</span><del>-IntPoint ScrollView::convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntPoint& localPoint) const
</del><ins>+IntPoint ScrollView::convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntPoint& localPoint) const
</ins><span class="cx"> {
</span><span class="cx"> // Scrollbars won't be transformed within us
</span><span class="cx"> IntPoint newPoint = localPoint;
</span><del>- newPoint.moveBy(scrollbar->location());
</del><ins>+ newPoint.moveBy(scrollbar.location());
</ins><span class="cx"> return newPoint;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint ScrollView::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
</del><ins>+IntPoint ScrollView::convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntPoint& parentPoint) const
</ins><span class="cx"> {
</span><span class="cx"> IntPoint newPoint = parentPoint;
</span><span class="cx"> // Scrollbars won't be transformed within us
</span><del>- newPoint.moveBy(-scrollbar->location());
</del><ins>+ newPoint.moveBy(-scrollbar.location());
</ins><span class="cx"> return newPoint;
</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 (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/platform/ScrollView.h 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -367,10 +367,10 @@
</span><span class="cx"> virtual void paintScrollCorner(GraphicsContext&, const IntRect& cornerRect);
</span><span class="cx"> virtual void paintScrollbar(GraphicsContext&, Scrollbar&, const IntRect&);
</span><span class="cx">
</span><del>- IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override;
- IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override;
- IntPoint convertFromScrollbarToContainingView(const Scrollbar*, const IntPoint&) const override;
- IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, const IntPoint&) const override;
</del><ins>+ IntRect convertFromScrollbarToContainingView(const Scrollbar&, const IntRect&) const override;
+ IntRect convertFromContainingViewToScrollbar(const Scrollbar&, const IntRect&) const override;
+ IntPoint convertFromScrollbarToContainingView(const Scrollbar&, const IntPoint&) const override;
+ IntPoint convertFromContainingViewToScrollbar(const Scrollbar&, const IntPoint&) const override;
</ins><span class="cx">
</span><span class="cx"> void calculateAndPaintOverhangAreas(GraphicsContext&, const IntRect& dirtyRect);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -369,15 +369,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollableArea::invalidateScrollbar(Scrollbar* scrollbar, const IntRect& rect)
</del><ins>+void ScrollableArea::invalidateScrollbar(Scrollbar& scrollbar, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (scrollbar == horizontalScrollbar()) {
</del><ins>+ if (&scrollbar == horizontalScrollbar()) {
</ins><span class="cx"> if (GraphicsLayer* graphicsLayer = layerForHorizontalScrollbar()) {
</span><span class="cx"> graphicsLayer->setNeedsDisplay();
</span><span class="cx"> graphicsLayer->setContentsNeedsDisplay();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- } else if (scrollbar == verticalScrollbar()) {
</del><ins>+ } else if (&scrollbar == verticalScrollbar()) {
</ins><span class="cx"> if (GraphicsLayer* graphicsLayer = layerForVerticalScrollbar()) {
</span><span class="cx"> graphicsLayer->setNeedsDisplay();
</span><span class="cx"> graphicsLayer->setContentsNeedsDisplay();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> virtual bool isActive() const = 0;
</span><span class="cx"> virtual int scrollSize(ScrollbarOrientation) const = 0;
</span><span class="cx"> virtual int scrollOffset(ScrollbarOrientation) const = 0;
</span><del>- WEBCORE_EXPORT virtual void invalidateScrollbar(Scrollbar*, const IntRect&);
</del><ins>+ WEBCORE_EXPORT virtual void invalidateScrollbar(Scrollbar&, const IntRect&);
</ins><span class="cx"> virtual bool isScrollCornerVisible() const = 0;
</span><span class="cx"> virtual IntRect scrollCornerRect() const = 0;
</span><span class="cx"> WEBCORE_EXPORT virtual void invalidateScrollCorner(const IntRect&);
</span><span class="lines">@@ -159,21 +159,21 @@
</span><span class="cx"> // Convert points and rects between the scrollbar and its containing view.
</span><span class="cx"> // The client needs to implement these in order to be aware of layout effects
</span><span class="cx"> // like CSS transforms.
</span><del>- virtual IntRect convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntRect& scrollbarRect) const
</del><ins>+ virtual IntRect convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntRect& scrollbarRect) const
</ins><span class="cx"> {
</span><del>- return scrollbar->Widget::convertToContainingView(scrollbarRect);
</del><ins>+ return scrollbar.Widget::convertToContainingView(scrollbarRect);
</ins><span class="cx"> }
</span><del>- virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
</del><ins>+ virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntRect& parentRect) const
</ins><span class="cx"> {
</span><del>- return scrollbar->Widget::convertFromContainingView(parentRect);
</del><ins>+ return scrollbar.Widget::convertFromContainingView(parentRect);
</ins><span class="cx"> }
</span><del>- virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntPoint& scrollbarPoint) const
</del><ins>+ virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntPoint& scrollbarPoint) const
</ins><span class="cx"> {
</span><del>- return scrollbar->Widget::convertToContainingView(scrollbarPoint);
</del><ins>+ return scrollbar.Widget::convertToContainingView(scrollbarPoint);
</ins><span class="cx"> }
</span><del>- virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
</del><ins>+ virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntPoint& parentPoint) const
</ins><span class="cx"> {
</span><del>- return scrollbar->Widget::convertFromContainingView(parentPoint);
</del><ins>+ return scrollbar.Widget::convertFromContainingView(parentPoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int horizontalScrollbarIntrusion() const;
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> void resetScrollOriginChanged() { m_scrollOriginChanged = false; }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT virtual float adjustScrollStepForFixedContent(float step, ScrollbarOrientation, ScrollGranularity);
</span><del>- virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) = 0;
</del><ins>+ virtual void invalidateScrollbarRect(Scrollbar&, const IntRect&) = 0;
</ins><span class="cx"> virtual void invalidateScrollCornerRect(const IntRect&) = 0;
</span><span class="cx">
</span><span class="cx"> friend class ScrollingCoordinator;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -454,27 +454,27 @@
</span><span class="cx"> if (suppressInvalidation())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_scrollableArea.invalidateScrollbar(this, rect);
</del><ins>+ m_scrollableArea.invalidateScrollbar(*this, rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect Scrollbar::convertToContainingView(const IntRect& localRect) const
</span><span class="cx"> {
</span><del>- return m_scrollableArea.convertFromScrollbarToContainingView(this, localRect);
</del><ins>+ return m_scrollableArea.convertFromScrollbarToContainingView(*this, localRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect Scrollbar::convertFromContainingView(const IntRect& parentRect) const
</span><span class="cx"> {
</span><del>- return m_scrollableArea.convertFromContainingViewToScrollbar(this, parentRect);
</del><ins>+ return m_scrollableArea.convertFromContainingViewToScrollbar(*this, parentRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntPoint Scrollbar::convertToContainingView(const IntPoint& localPoint) const
</span><span class="cx"> {
</span><del>- return m_scrollableArea.convertFromScrollbarToContainingView(this, localPoint);
</del><ins>+ return m_scrollableArea.convertFromScrollbarToContainingView(*this, localPoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const
</span><span class="cx"> {
</span><del>- return m_scrollableArea.convertFromContainingViewToScrollbar(this, parentPoint);
</del><ins>+ return m_scrollableArea.convertFromContainingViewToScrollbar(*this, parentPoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Scrollbar::supportsUpdateOnSecondaryThread() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.cpp (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -720,10 +720,10 @@
</span><span class="cx"> ::UpdateWindow(m_popup);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PopupMenuWin::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
</del><ins>+void PopupMenuWin::invalidateScrollbarRect(Scrollbar& scrollbar, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect scrollRect = rect;
</span><del>- scrollRect.move(scrollbar->x(), scrollbar->y());
</del><ins>+ scrollRect.move(scrollbar.x(), scrollbar.y());
</ins><span class="cx"> RECT r = scrollRect;
</span><span class="cx"> ::InvalidateRect(m_popup, &r, false);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.h (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.h 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.h 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> int scrollSize(ScrollbarOrientation) const override;
</span><span class="cx"> int scrollOffset(ScrollbarOrientation) const override;
</span><span class="cx"> void setScrollOffset(const IntPoint&) override;
</span><del>- void invalidateScrollbarRect(Scrollbar*, const IntRect&) override;
</del><ins>+ void invalidateScrollbarRect(Scrollbar&, const IntRect&) override;
</ins><span class="cx"> void invalidateScrollCornerRect(const IntRect&) override { }
</span><span class="cx"> bool isActive() const override { return true; }
</span><span class="cx"> ScrollableArea* enclosingScrollableArea() const override { return 0; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -2860,7 +2860,7 @@
</span><span class="cx"> return !scrollCornerRect().isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect RenderLayer::convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntRect& scrollbarRect) const
</del><ins>+IntRect RenderLayer::convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntRect& scrollbarRect) const
</ins><span class="cx"> {
</span><span class="cx"> IntRect rect = scrollbarRect;
</span><span class="cx"> rect.move(scrollbarOffset(scrollbar));
</span><span class="lines">@@ -2868,21 +2868,21 @@
</span><span class="cx"> return renderer().view().frameView().convertFromRendererToContainingView(&renderer(), rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect RenderLayer::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
</del><ins>+IntRect RenderLayer::convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntRect& parentRect) const
</ins><span class="cx"> {
</span><span class="cx"> IntRect rect = renderer().view().frameView().convertFromContainingViewToRenderer(&renderer(), parentRect);
</span><span class="cx"> rect.move(-scrollbarOffset(scrollbar));
</span><span class="cx"> return rect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint RenderLayer::convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntPoint& scrollbarPoint) const
</del><ins>+IntPoint RenderLayer::convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntPoint& scrollbarPoint) const
</ins><span class="cx"> {
</span><span class="cx"> IntPoint point = scrollbarPoint;
</span><span class="cx"> point.move(scrollbarOffset(scrollbar));
</span><span class="cx"> return renderer().view().frameView().convertFromRendererToContainingView(&renderer(), point);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint RenderLayer::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
</del><ins>+IntPoint RenderLayer::convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntPoint& parentPoint) const
</ins><span class="cx"> {
</span><span class="cx"> IntPoint point = renderer().view().frameView().convertFromContainingViewToRenderer(&renderer(), parentPoint);
</span><span class="cx"> point.move(-scrollbarOffset(scrollbar));
</span><span class="lines">@@ -3008,26 +3008,26 @@
</span><span class="cx"> return x;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntSize RenderLayer::scrollbarOffset(const Scrollbar* scrollbar) const
</del><ins>+IntSize RenderLayer::scrollbarOffset(const Scrollbar& scrollbar) const
</ins><span class="cx"> {
</span><span class="cx"> RenderBox* box = renderBox();
</span><span class="cx">
</span><del>- if (scrollbar == m_vBar.get())
</del><ins>+ if (&scrollbar == m_vBar.get())
</ins><span class="cx"> return IntSize(verticalScrollbarStart(0, box->width()), box->borderTop());
</span><span class="cx">
</span><del>- if (scrollbar == m_hBar.get())
- return IntSize(horizontalScrollbarStart(0), box->height() - box->borderBottom() - scrollbar->height());
</del><ins>+ if (&scrollbar == m_hBar.get())
+ return IntSize(horizontalScrollbarStart(0), box->height() - box->borderBottom() - scrollbar.height());
</ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return IntSize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayer::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
</del><ins>+void RenderLayer::invalidateScrollbarRect(Scrollbar& scrollbar, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (!showsOverflowControls())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (scrollbar == m_vBar.get()) {
</del><ins>+ if (&scrollbar == m_vBar.get()) {
</ins><span class="cx"> if (GraphicsLayer* layer = layerForVerticalScrollbar()) {
</span><span class="cx"> layer->setNeedsDisplayInRect(rect);
</span><span class="cx"> return;
</span><span class="lines">@@ -3046,10 +3046,10 @@
</span><span class="cx"> if (!box->parent())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (scrollbar == m_vBar.get())
</del><ins>+ if (&scrollbar == m_vBar.get())
</ins><span class="cx"> scrollRect.move(verticalScrollbarStart(0, box->width()), box->borderTop());
</span><span class="cx"> else
</span><del>- scrollRect.move(horizontalScrollbarStart(0), box->height() - box->borderBottom() - scrollbar->height());
</del><ins>+ scrollRect.move(horizontalScrollbarStart(0), box->height() - box->borderBottom() - scrollbar.height());
</ins><span class="cx"> LayoutRect repaintRect = scrollRect;
</span><span class="cx"> renderBox()->flipForWritingMode(repaintRect);
</span><span class="cx"> renderer().repaintRectangle(repaintRect);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -860,15 +860,15 @@
</span><span class="cx"> int scrollOffset(ScrollbarOrientation) const override;
</span><span class="cx">
</span><span class="cx"> // ScrollableArea interface
</span><del>- void invalidateScrollbarRect(Scrollbar*, const IntRect&) override;
</del><ins>+ void invalidateScrollbarRect(Scrollbar&, const IntRect&) override;
</ins><span class="cx"> void invalidateScrollCornerRect(const IntRect&) override;
</span><span class="cx"> bool isActive() const override;
</span><span class="cx"> bool isScrollCornerVisible() const override;
</span><span class="cx"> IntRect scrollCornerRect() const override;
</span><del>- IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override;
- IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override;
- IntPoint convertFromScrollbarToContainingView(const Scrollbar*, const IntPoint&) const override;
- IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, const IntPoint&) const override;
</del><ins>+ IntRect convertFromScrollbarToContainingView(const Scrollbar&, const IntRect&) const override;
+ IntRect convertFromContainingViewToScrollbar(const Scrollbar&, const IntRect&) const override;
+ IntPoint convertFromScrollbarToContainingView(const Scrollbar&, const IntPoint&) const override;
+ IntPoint convertFromContainingViewToScrollbar(const Scrollbar&, const IntPoint&) const override;
</ins><span class="cx"> int scrollSize(ScrollbarOrientation) const override;
</span><span class="cx"> void setScrollOffset(const ScrollOffset&) override;
</span><span class="cx">
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> void scrollTo(const ScrollPosition&);
</span><span class="cx"> void updateCompositingLayersAfterScroll();
</span><span class="cx">
</span><del>- IntSize scrollbarOffset(const Scrollbar*) const;
</del><ins>+ IntSize scrollbarOffset(const Scrollbar&) const;
</ins><span class="cx">
</span><span class="cx"> void updateScrollableAreaSet(bool hasOverflow);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -3492,7 +3492,7 @@
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><span class="cx"> scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_renderView.frameView(), HorizontalScrollbar);
</span><span class="cx"> if (Scrollbar* horizontalScrollbar = m_renderView.frameView().verticalScrollbar())
</span><del>- m_renderView.frameView().invalidateScrollbar(horizontalScrollbar, IntRect(IntPoint(0, 0), horizontalScrollbar->frameRect().size()));
</del><ins>+ m_renderView.frameView().invalidateScrollbar(*horizontalScrollbar, IntRect(IntPoint(0, 0), horizontalScrollbar->frameRect().size()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_layerForVerticalScrollbar) {
</span><span class="lines">@@ -3501,7 +3501,7 @@
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><span class="cx"> scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_renderView.frameView(), VerticalScrollbar);
</span><span class="cx"> if (Scrollbar* verticalScrollbar = m_renderView.frameView().verticalScrollbar())
</span><del>- m_renderView.frameView().invalidateScrollbar(verticalScrollbar, IntRect(IntPoint(0, 0), verticalScrollbar->frameRect().size()));
</del><ins>+ m_renderView.frameView().invalidateScrollbar(*verticalScrollbar, IntRect(IntPoint(0, 0), verticalScrollbar->frameRect().size()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_layerForScrollCorner) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -729,44 +729,44 @@
</span><span class="cx"> return page && page->focusController().isActive();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderListBox::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
</del><ins>+void RenderListBox::invalidateScrollbarRect(Scrollbar& scrollbar, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect scrollRect = rect;
</span><del>- scrollRect.move(width() - borderRight() - scrollbar->width(), borderTop());
</del><ins>+ scrollRect.move(width() - borderRight() - scrollbar.width(), borderTop());
</ins><span class="cx"> repaintRectangle(scrollRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect RenderListBox::convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntRect& scrollbarRect) const
</del><ins>+IntRect RenderListBox::convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntRect& scrollbarRect) const
</ins><span class="cx"> {
</span><span class="cx"> IntRect rect = scrollbarRect;
</span><del>- int scrollbarLeft = width() - borderRight() - scrollbar->width();
</del><ins>+ int scrollbarLeft = width() - borderRight() - scrollbar.width();
</ins><span class="cx"> int scrollbarTop = borderTop();
</span><span class="cx"> rect.move(scrollbarLeft, scrollbarTop);
</span><span class="cx"> return view().frameView().convertFromRendererToContainingView(this, rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect RenderListBox::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
</del><ins>+IntRect RenderListBox::convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntRect& parentRect) const
</ins><span class="cx"> {
</span><span class="cx"> IntRect rect = view().frameView().convertFromContainingViewToRenderer(this, parentRect);
</span><del>- int scrollbarLeft = width() - borderRight() - scrollbar->width();
</del><ins>+ int scrollbarLeft = width() - borderRight() - scrollbar.width();
</ins><span class="cx"> int scrollbarTop = borderTop();
</span><span class="cx"> rect.move(-scrollbarLeft, -scrollbarTop);
</span><span class="cx"> return rect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint RenderListBox::convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntPoint& scrollbarPoint) const
</del><ins>+IntPoint RenderListBox::convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntPoint& scrollbarPoint) const
</ins><span class="cx"> {
</span><span class="cx"> IntPoint point = scrollbarPoint;
</span><del>- int scrollbarLeft = width() - borderRight() - scrollbar->width();
</del><ins>+ int scrollbarLeft = width() - borderRight() - scrollbar.width();
</ins><span class="cx"> int scrollbarTop = borderTop();
</span><span class="cx"> point.move(scrollbarLeft, scrollbarTop);
</span><span class="cx"> return view().frameView().convertFromRendererToContainingView(this, point);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint RenderListBox::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
</del><ins>+IntPoint RenderListBox::convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntPoint& parentPoint) const
</ins><span class="cx"> {
</span><span class="cx"> IntPoint point = view().frameView().convertFromContainingViewToRenderer(this, parentPoint);
</span><del>- int scrollbarLeft = width() - borderRight() - scrollbar->width();
</del><ins>+ int scrollbarLeft = width() - borderRight() - scrollbar.width();
</ins><span class="cx"> int scrollbarTop = borderTop();
</span><span class="cx"> point.move(-scrollbarLeft, -scrollbarTop);
</span><span class="cx"> return point;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -114,15 +114,15 @@
</span><span class="cx"> void setScrollOffset(const ScrollOffset&) override;
</span><span class="cx"> ScrollPosition minimumScrollPosition() const override;
</span><span class="cx"> ScrollPosition maximumScrollPosition() const override;
</span><del>- void invalidateScrollbarRect(Scrollbar*, const IntRect&) override;
</del><ins>+ void invalidateScrollbarRect(Scrollbar&, const IntRect&) override;
</ins><span class="cx"> bool isActive() const override;
</span><span class="cx"> bool isScrollCornerVisible() const override { return false; } // We don't support resize on list boxes yet. If we did these would have to change.
</span><span class="cx"> IntRect scrollCornerRect() const override { return IntRect(); }
</span><span class="cx"> void invalidateScrollCornerRect(const IntRect&) override { }
</span><del>- IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override;
- IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override;
- IntPoint convertFromScrollbarToContainingView(const Scrollbar*, const IntPoint&) const override;
- IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, const IntPoint&) const override;
</del><ins>+ IntRect convertFromScrollbarToContainingView(const Scrollbar&, const IntRect&) const override;
+ IntRect convertFromContainingViewToScrollbar(const Scrollbar&, const IntRect&) const override;
+ IntPoint convertFromScrollbarToContainingView(const Scrollbar&, const IntPoint&) const override;
+ IntPoint convertFromContainingViewToScrollbar(const Scrollbar&, const IntPoint&) const override;
</ins><span class="cx"> Scrollbar* verticalScrollbar() const override { return m_vBar.get(); }
</span><span class="cx"> IntSize contentsSize() const override;
</span><span class="cx"> IntSize visibleSize() const override { return IntSize(width(), height()); }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-30 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Use references instead of pointers in scrollbar-related code
+ https://bugs.webkit.org/show_bug.cgi?id=155998
+
+ Reviewed by Dean Jackson.
+
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm:
+ (WebKit::PDFPlugin::convertFromScrollbarToContainingView):
+ (WebKit::PDFPlugin::convertFromContainingViewToScrollbar):
+ (WebKit::PDFPlugin::invalidateScrollbarRect):
+
</ins><span class="cx"> 2016-03-29 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Yosemite-only: com.apple.WebKit.Plugin.32.Development crashed in PluginProcessShim.dylib: WebKit::shimMachVMMap + 26
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> bool hasScrollableOrRubberbandableAncestor() override { return true; }
</span><span class="cx"> WebCore::IntRect scrollableAreaBoundingBox(bool* = nullptr) const override;
</span><span class="cx"> void setScrollOffset(const WebCore::ScrollOffset&) override;
</span><del>- void invalidateScrollbarRect(WebCore::Scrollbar*, const WebCore::IntRect&) override;
</del><ins>+ void invalidateScrollbarRect(WebCore::Scrollbar&, const WebCore::IntRect&) override;
</ins><span class="cx"> void invalidateScrollCornerRect(const WebCore::IntRect&) override;
</span><span class="cx"> WebCore::IntPoint lastKnownMousePosition() const override { return m_lastMousePositionInPluginCoordinates; }
</span><span class="cx"> int scrollSize(WebCore::ScrollbarOrientation) const override;
</span><span class="lines">@@ -207,10 +207,10 @@
</span><span class="cx"> WebCore::Scrollbar* verticalScrollbar() const override { return m_verticalScrollbar.get(); }
</span><span class="cx"> bool shouldSuspendScrollAnimations() const override { return false; } // If we return true, ScrollAnimatorMac will keep cycling a timer forever, waiting for a good time to animate.
</span><span class="cx"> void scrollbarStyleChanged(WebCore::ScrollbarStyle, bool forceUpdate) override;
</span><del>- WebCore::IntRect convertFromScrollbarToContainingView(const WebCore::Scrollbar*, const WebCore::IntRect& scrollbarRect) const override;
- WebCore::IntRect convertFromContainingViewToScrollbar(const WebCore::Scrollbar*, const WebCore::IntRect& parentRect) const override;
- WebCore::IntPoint convertFromScrollbarToContainingView(const WebCore::Scrollbar*, const WebCore::IntPoint& scrollbarPoint) const override;
- WebCore::IntPoint convertFromContainingViewToScrollbar(const WebCore::Scrollbar*, const WebCore::IntPoint& parentPoint) const override;
</del><ins>+ WebCore::IntRect convertFromScrollbarToContainingView(const WebCore::Scrollbar&, const WebCore::IntRect& scrollbarRect) const override;
+ WebCore::IntRect convertFromContainingViewToScrollbar(const WebCore::Scrollbar&, const WebCore::IntRect& parentRect) const override;
+ WebCore::IntPoint convertFromScrollbarToContainingView(const WebCore::Scrollbar&, const WebCore::IntPoint& scrollbarPoint) const override;
+ WebCore::IntPoint convertFromContainingViewToScrollbar(const WebCore::Scrollbar&, const WebCore::IntPoint& parentPoint) const override;
</ins><span class="cx"> bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</span><span class="cx"> bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm (198840 => 198841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-03-30 16:37:28 UTC (rev 198840)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.mm 2016-03-30 16:50:14 UTC (rev 198841)
</span><span class="lines">@@ -688,34 +688,34 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect PDFPlugin::convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntRect& scrollbarRect) const
</del><ins>+IntRect PDFPlugin::convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntRect& scrollbarRect) const
</ins><span class="cx"> {
</span><span class="cx"> IntRect rect = scrollbarRect;
</span><del>- rect.move(scrollbar->location() - pluginView()->location());
</del><ins>+ rect.move(scrollbar.location() - pluginView()->location());
</ins><span class="cx">
</span><span class="cx"> return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->pluginElement()->renderer(), rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect PDFPlugin::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntRect& parentRect) const
</del><ins>+IntRect PDFPlugin::convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntRect& parentRect) const
</ins><span class="cx"> {
</span><span class="cx"> IntRect rect = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->pluginElement()->renderer(), parentRect);
</span><del>- rect.move(pluginView()->location() - scrollbar->location());
</del><ins>+ rect.move(pluginView()->location() - scrollbar.location());
</ins><span class="cx">
</span><span class="cx"> return rect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint PDFPlugin::convertFromScrollbarToContainingView(const Scrollbar* scrollbar, const IntPoint& scrollbarPoint) const
</del><ins>+IntPoint PDFPlugin::convertFromScrollbarToContainingView(const Scrollbar& scrollbar, const IntPoint& scrollbarPoint) const
</ins><span class="cx"> {
</span><span class="cx"> IntPoint point = scrollbarPoint;
</span><del>- point.move(scrollbar->location() - pluginView()->location());
</del><ins>+ point.move(scrollbar.location() - pluginView()->location());
</ins><span class="cx">
</span><span class="cx"> return pluginView()->frame()->view()->convertFromRendererToContainingView(pluginView()->pluginElement()->renderer(), point);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint PDFPlugin::convertFromContainingViewToScrollbar(const Scrollbar* scrollbar, const IntPoint& parentPoint) const
</del><ins>+IntPoint PDFPlugin::convertFromContainingViewToScrollbar(const Scrollbar& scrollbar, const IntPoint& parentPoint) const
</ins><span class="cx"> {
</span><span class="cx"> IntPoint point = pluginView()->frame()->view()->convertFromContainingViewToRenderer(pluginView()->pluginElement()->renderer(), parentPoint);
</span><del>- point.move(pluginView()->location() - scrollbar->location());
</del><ins>+ point.move(pluginView()->location() - scrollbar.location());
</ins><span class="cx">
</span><span class="cx"> return point;
</span><span class="cx"> }
</span><span class="lines">@@ -1567,11 +1567,11 @@
</span><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PDFPlugin::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
</del><ins>+void PDFPlugin::invalidateScrollbarRect(Scrollbar& scrollbar, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- if (scrollbar == horizontalScrollbar())
</del><ins>+ if (&scrollbar == horizontalScrollbar())
</ins><span class="cx"> [m_horizontalScrollbarLayer setNeedsDisplay];
</span><del>- else if (scrollbar == verticalScrollbar())
</del><ins>+ else if (&scrollbar == verticalScrollbar())
</ins><span class="cx"> [m_verticalScrollbarLayer setNeedsDisplay];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>