<!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>[192233] releases/WebKitGTK/webkit-2.10/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/192233">192233</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-10 05:32:10 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191915">r191915</a> - hasOverflowClip() does not necessarily mean valid layer().
https://bugs.webkit.org/show_bug.cgi?id=150814
Reviewed by Simon Fraser.
Certain RenderLayerModelObject derived classes simply return false for ::requiresLayer(), which means
that we end up not creating a layer for the overflow clipped content.
No change in functionality.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::updateScrollInfoAfterLayout):
(WebCore::RenderBlock::paint):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::styleDidChange):
(WebCore::RenderBox::scrollWidth):
(WebCore::RenderBox::scrollHeight):
(WebCore::RenderBox::scrollLeft):
(WebCore::RenderBox::scrollTop):
(WebCore::RenderBox::setScrollLeft):
(WebCore::RenderBox::setScrollTop):
(WebCore::RenderBox::includeVerticalScrollbarSize):
(WebCore::RenderBox::includeHorizontalScrollbarSize):
(WebCore::RenderBox::intrinsicScrollbarLogicalWidth):
(WebCore::RenderBox::usesCompositedScrolling):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBlockcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBoxcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (192232 => 192233)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 13:24:08 UTC (rev 192232)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 13:32:10 UTC (rev 192233)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-11-02 Zalan Bujtas <zalan@apple.com>
+
+ hasOverflowClip() does not necessarily mean valid layer().
+ https://bugs.webkit.org/show_bug.cgi?id=150814
+
+ Reviewed by Simon Fraser.
+
+ Certain RenderLayerModelObject derived classes simply return false for ::requiresLayer(), which means
+ that we end up not creating a layer for the overflow clipped content.
+
+ No change in functionality.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::updateScrollInfoAfterLayout):
+ (WebCore::RenderBlock::paint):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::styleDidChange):
+ (WebCore::RenderBox::scrollWidth):
+ (WebCore::RenderBox::scrollHeight):
+ (WebCore::RenderBox::scrollLeft):
+ (WebCore::RenderBox::scrollTop):
+ (WebCore::RenderBox::setScrollLeft):
+ (WebCore::RenderBox::setScrollTop):
+ (WebCore::RenderBox::includeVerticalScrollbarSize):
+ (WebCore::RenderBox::includeHorizontalScrollbarSize):
+ (WebCore::RenderBox::intrinsicScrollbarLogicalWidth):
+ (WebCore::RenderBox::usesCompositedScrolling):
+
</ins><span class="cx"> 2015-11-01 Philip Chimento <philip.chimento@gmail.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix combinations of PLATFORM(GTK) and OS(DARWIN)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlock.cpp (192232 => 192233)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlock.cpp 2015-11-10 13:24:08 UTC (rev 192232)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlock.cpp 2015-11-10 13:32:10 UTC (rev 192233)
</span><span class="lines">@@ -900,23 +900,22 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlock::updateScrollInfoAfterLayout()
</span><span class="cx"> {
</span><del>- if (hasOverflowClip()) {
- if (style().isFlippedBlocksWritingMode()) {
- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=97937
- // Workaround for now. We cannot delay the scroll info for overflow
- // for items with opposite writing directions, as the contents needs
- // to overflow in that direction
- layer()->updateScrollInfoAfterLayout();
- return;
- }
-
</del><ins>+ if (!hasOverflowClip())
+ return;
+
+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=97937
+ // Workaround for now. We cannot delay the scroll info for overflow
+ // for items with opposite writing directions, as the contents needs
+ // to overflow in that direction
+ if (!style().isFlippedBlocksWritingMode()) {
</ins><span class="cx"> UpdateScrollInfoAfterLayoutTransaction* transaction = currentUpdateScrollInfoAfterLayoutTransaction();
</span><span class="cx"> if (transaction && transaction->view == &view()) {
</span><span class="cx"> transaction->blocks.add(this);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ }
+ if (layer())
</ins><span class="cx"> layer()->updateScrollInfoAfterLayout();
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::layout()
</span><span class="lines">@@ -1422,9 +1421,10 @@
</span><span class="cx"> popContentsClip(paintInfo, phase, adjustedPaintOffset);
</span><span class="cx">
</span><span class="cx"> // Our scrollbar widgets paint exactly when we tell them to, so that they work properly with
</span><del>- // z-index. We paint after we painted the background/border, so that the scrollbars will
</del><ins>+ // z-index. We paint after we painted the background/border, so that the scrollbars will
</ins><span class="cx"> // sit above the background/border.
</span><del>- if ((phase == PaintPhaseBlockBackground || phase == PaintPhaseChildBlockBackground) && hasOverflowClip() && style().visibility() == VISIBLE && paintInfo.shouldPaintWithinRoot(*this) && !paintInfo.paintRootBackgroundOnly())
</del><ins>+ if ((phase == PaintPhaseBlockBackground || phase == PaintPhaseChildBlockBackground) && hasOverflowClip() && layer()
+ && style().visibility() == VISIBLE && paintInfo.shouldPaintWithinRoot(*this) && !paintInfo.paintRootBackgroundOnly())
</ins><span class="cx"> layer()->paintOverflowControls(paintInfo.context, roundedIntPoint(adjustedPaintOffset), snappedIntRect(paintInfo.rect));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp (192232 => 192233)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp 2015-11-10 13:24:08 UTC (rev 192232)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp 2015-11-10 13:32:10 UTC (rev 192233)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx">
</span><span class="cx"> // If our zoom factor changes and we have a defined scrollLeft/Top, we need to adjust that value into the
</span><span class="cx"> // new zoomed coordinate space.
</span><del>- if (hasOverflowClip() && oldStyle && oldStyle->effectiveZoom() != newStyle.effectiveZoom() && layer()) {
</del><ins>+ if (hasOverflowClip() && layer() && oldStyle && oldStyle->effectiveZoom() != newStyle.effectiveZoom()) {
</ins><span class="cx"> if (int left = layer()->scrollXOffset()) {
</span><span class="cx"> left = (left / oldStyle->effectiveZoom()) * newStyle.effectiveZoom();
</span><span class="cx"> layer()->scrollToXOffset(left);
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx">
</span><span class="cx"> int RenderBox::scrollWidth() const
</span><span class="cx"> {
</span><del>- if (hasOverflowClip())
</del><ins>+ if (hasOverflowClip() && layer())
</ins><span class="cx"> return layer()->scrollWidth();
</span><span class="cx"> // For objects with visible overflow, this matches IE.
</span><span class="cx"> // FIXME: Need to work right with writing modes.
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx">
</span><span class="cx"> int RenderBox::scrollHeight() const
</span><span class="cx"> {
</span><del>- if (hasOverflowClip())
</del><ins>+ if (hasOverflowClip() && layer())
</ins><span class="cx"> return layer()->scrollHeight();
</span><span class="cx"> // For objects with visible overflow, this matches IE.
</span><span class="cx"> // FIXME: Need to work right with writing modes.
</span><span class="lines">@@ -620,12 +620,12 @@
</span><span class="cx">
</span><span class="cx"> int RenderBox::scrollLeft() const
</span><span class="cx"> {
</span><del>- return hasOverflowClip() ? layer()->scrollXOffset() : 0;
</del><ins>+ return hasOverflowClip() && layer() ? layer()->scrollXOffset() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderBox::scrollTop() const
</span><span class="cx"> {
</span><del>- return hasOverflowClip() ? layer()->scrollYOffset() : 0;
</del><ins>+ return hasOverflowClip() && layer() ? layer()->scrollYOffset() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setupWheelEventTestTrigger(RenderLayer& layer, Frame* frame)
</span><span class="lines">@@ -642,18 +642,18 @@
</span><span class="cx">
</span><span class="cx"> void RenderBox::setScrollLeft(int newLeft)
</span><span class="cx"> {
</span><del>- if (hasOverflowClip()) {
- setupWheelEventTestTrigger(*layer(), document().frame());
- layer()->scrollToXOffset(newLeft, RenderLayer::ScrollOffsetClamped);
- }
</del><ins>+ if (!hasOverflowClip() || !layer())
+ return;
+ setupWheelEventTestTrigger(*layer(), document().frame());
+ layer()->scrollToXOffset(newLeft, RenderLayer::ScrollOffsetClamped);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBox::setScrollTop(int newTop)
</span><span class="cx"> {
</span><del>- if (hasOverflowClip()) {
- setupWheelEventTestTrigger(*layer(), document().frame());
- layer()->scrollToYOffset(newTop, RenderLayer::ScrollOffsetClamped);
- }
</del><ins>+ if (!hasOverflowClip() || !layer())
+ return;
+ setupWheelEventTestTrigger(*layer(), document().frame());
+ layer()->scrollToYOffset(newTop, RenderLayer::ScrollOffsetClamped);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBox::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
</span><span class="lines">@@ -804,13 +804,13 @@
</span><span class="cx">
</span><span class="cx"> bool RenderBox::includeVerticalScrollbarSize() const
</span><span class="cx"> {
</span><del>- return hasOverflowClip() && !layer()->hasOverlayScrollbars()
</del><ins>+ return hasOverflowClip() && layer() && !layer()->hasOverlayScrollbars()
</ins><span class="cx"> && (style().overflowY() == OSCROLL || style().overflowY() == OAUTO);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBox::includeHorizontalScrollbarSize() const
</span><span class="cx"> {
</span><del>- return hasOverflowClip() && !layer()->hasOverlayScrollbars()
</del><ins>+ return hasOverflowClip() && layer() && !layer()->hasOverlayScrollbars()
</ins><span class="cx"> && (style().overflowX() == OSCROLL || style().overflowX() == OAUTO);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -830,12 +830,12 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (isHorizontalWritingMode() && (style().overflowY() == OSCROLL && !hasVerticalScrollbarWithAutoBehavior())) {
</span><del>- ASSERT(layer()->hasVerticalScrollbar());
</del><ins>+ ASSERT(layer() && layer()->hasVerticalScrollbar());
</ins><span class="cx"> return verticalScrollbarWidth();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!isHorizontalWritingMode() && (style().overflowX() == OSCROLL && !hasHorizontalScrollbarWithAutoBehavior())) {
</span><del>- ASSERT(layer()->hasHorizontalScrollbar());
</del><ins>+ ASSERT(layer() && layer()->hasHorizontalScrollbar());
</ins><span class="cx"> return horizontalScrollbarHeight();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>