<!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>[173023] 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/173023">173023</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-08-27 15:20:49 -0700 (Wed, 27 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make isScrollableOrRubberbandable() a virtual function on RenderLayerModelObject
https://bugs.webkit.org/show_bug.cgi?id=136307
Reviewed by Simon Fraser.
Remove extra parentheses.
* page/FrameView.cpp:
(WebCore::FrameView::isScrollable):
Mark isScrollableOrRubberbandable() as override now that the root implementation
is moving to RenderLayerModelObject. It can also be private now.
* rendering/RenderBox.h:
isBox() check and cast are no longer necessary.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::hasScrollableOrRubberbandableAncestor):
Base implementation should return false.
* rendering/RenderLayerModelObject.h:
(WebCore::RenderLayerModelObject::isScrollableOrRubberbandable):
Mark as override.
* rendering/RenderView.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="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerModelObjecth">trunk/Source/WebCore/rendering/RenderLayerModelObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173022 => 173023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-27 22:18:37 UTC (rev 173022)
+++ trunk/Source/WebCore/ChangeLog 2014-08-27 22:20:49 UTC (rev 173023)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-08-27 Beth Dakin <bdakin@apple.com>
+
+ Make isScrollableOrRubberbandable() a virtual function on RenderLayerModelObject
+ https://bugs.webkit.org/show_bug.cgi?id=136307
+
+ Reviewed by Simon Fraser.
+
+ Remove extra parentheses.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::isScrollable):
+
+ Mark isScrollableOrRubberbandable() as override now that the root implementation
+ is moving to RenderLayerModelObject. It can also be private now.
+ * rendering/RenderBox.h:
+
+ isBox() check and cast are no longer necessary.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::hasScrollableOrRubberbandableAncestor):
+
+ Base implementation should return false.
+ * rendering/RenderLayerModelObject.h:
+ (WebCore::RenderLayerModelObject::isScrollableOrRubberbandable):
+
+ Mark as override.
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2014-08-27 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r172946): Plugin tests asserting on Yosemite debug bot
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (173022 => 173023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-08-27 22:18:37 UTC (rev 173022)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-08-27 22:20:49 UTC (rev 173023)
</span><span class="lines">@@ -3282,7 +3282,7 @@
</span><span class="cx"> if (requiresActualOverflowToBeConsideredScrollable) {
</span><span class="cx"> IntSize totalContentsSize = this->totalContentsSize();
</span><span class="cx"> IntSize visibleContentSize = visibleContentRect(LegacyIOSDocumentVisibleRect).size();
</span><del>- if ((totalContentsSize.height() <= visibleContentSize.height() && totalContentsSize.width() <= visibleContentSize.width()))
</del><ins>+ if (totalContentsSize.height() <= visibleContentSize.height() && totalContentsSize.width() <= visibleContentSize.width())
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (173022 => 173023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2014-08-27 22:18:37 UTC (rev 173022)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2014-08-27 22:20:49 UTC (rev 173023)
</span><span class="lines">@@ -462,7 +462,6 @@
</span><span class="cx"> virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint());
</span><span class="cx"> virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);
</span><span class="cx"> bool canBeScrolledAndHasScrollableArea() const;
</span><del>- virtual bool isScrollableOrRubberbandable() const;
</del><span class="cx"> virtual bool canBeProgramaticallyScrolled() const;
</span><span class="cx"> virtual void autoscroll(const IntPoint&);
</span><span class="cx"> bool canAutoscroll() const;
</span><span class="lines">@@ -667,6 +666,8 @@
</span><span class="cx"> bool includeVerticalScrollbarSize() const;
</span><span class="cx"> bool includeHorizontalScrollbarSize() const;
</span><span class="cx">
</span><ins>+ virtual bool isScrollableOrRubberbandable() const override;
+
</ins><span class="cx"> // Returns true if we did a full repaint
</span><span class="cx"> bool repaintLayerRectsForImage(WrappedImagePtr image, const FillLayer* layers, bool drawingBackground);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (173022 => 173023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-08-27 22:18:37 UTC (rev 173022)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-08-27 22:20:49 UTC (rev 173023)
</span><span class="lines">@@ -3068,7 +3068,7 @@
</span><span class="cx"> bool RenderLayer::hasScrollableOrRubberbandableAncestor()
</span><span class="cx"> {
</span><span class="cx"> for (RenderLayer* nextLayer = parentLayerCrossFrame(this); nextLayer; nextLayer = parentLayerCrossFrame(nextLayer)) {
</span><del>- if (nextLayer->renderer().isBox() && toRenderBox(nextLayer->renderer()).isScrollableOrRubberbandable())
</del><ins>+ if (nextLayer->renderer().isScrollableOrRubberbandable())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.h (173022 => 173023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerModelObject.h 2014-08-27 22:18:37 UTC (rev 173022)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.h 2014-08-27 22:20:49 UTC (rev 173023)
</span><span class="lines">@@ -49,6 +49,8 @@
</span><span class="cx"> // The query rect is given in local coordinate system.
</span><span class="cx"> virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const { return false; }
</span><span class="cx">
</span><ins>+ virtual bool isScrollableOrRubberbandable() const { return false; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> RenderLayerModelObject(Element&, PassRef<RenderStyle>, unsigned baseTypeFlags);
</span><span class="cx"> RenderLayerModelObject(Document&, PassRef<RenderStyle>, unsigned baseTypeFlags);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (173022 => 173023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-08-27 22:18:37 UTC (rev 173022)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-08-27 22:20:49 UTC (rev 173023)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> friend class LayoutStateMaintainer;
</span><span class="cx"> friend class LayoutStateDisabler;
</span><span class="cx">
</span><del>- virtual bool isScrollableOrRubberbandable() const;
</del><ins>+ virtual bool isScrollableOrRubberbandable() const override;
</ins><span class="cx">
</span><span class="cx"> void splitSelectionBetweenSubtrees(RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode blockRepaintMode);
</span><span class="cx"> void clearSubtreeSelection(const SelectionSubtreeRoot&, SelectionRepaintMode, OldSelectionData&);
</span></span></pre>
</div>
</div>
</body>
</html>