<!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>[200953] 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/200953">200953</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-05-16 11:44:02 -0700 (Mon, 16 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>containingBlockFor*Position functions should take the renderer instead of the parent.
https://bugs.webkit.org/show_bug.cgi?id=157659
Reviewed by Simon Fraser.
containingBlockForFixedPosition, containingBlockForAbsolutePosition and containingBlockForObjectInFlow functions
expect the renderer's parent to be passed in (unless it is a RenderInline!). It is rather misleading and highly error-prone.
We should call them with the renderer itself instead.
* dom/Element.cpp:
(WebCore::layoutOverflowRectContainsAllDescendants): This expects ancestor containing block.
* rendering/LogicalSelectionOffsetCaches.h:
(WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches):
* rendering/RenderElement.cpp:
(WebCore::containingBlockForFixedPosition):
(WebCore::containingBlockForAbsolutePosition):
(WebCore::containingBlockForObjectInFlow):
* rendering/RenderElement.h:
* rendering/RenderInline.cpp:
(WebCore::RenderInline::styleWillChange):
* rendering/RenderLineBreak.cpp:
(WebCore::RenderLineBreak::collectSelectionRects): Not a behaviour change.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::containingBlock): RenderScrollbarPart renderer now returns
the containing block based on its owning renderer's style.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLogicalSelectionOffsetCachesh">trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLineBreakcpp">trunk/Source/WebCore/rendering/RenderLineBreak.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200952 => 200953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-16 18:26:32 UTC (rev 200952)
+++ trunk/Source/WebCore/ChangeLog 2016-05-16 18:44:02 UTC (rev 200953)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-05-16 Zalan Bujtas <zalan@apple.com>
+
+ containingBlockFor*Position functions should take the renderer instead of the parent.
+ https://bugs.webkit.org/show_bug.cgi?id=157659
+
+ Reviewed by Simon Fraser.
+
+ containingBlockForFixedPosition, containingBlockForAbsolutePosition and containingBlockForObjectInFlow functions
+ expect the renderer's parent to be passed in (unless it is a RenderInline!). It is rather misleading and highly error-prone.
+ We should call them with the renderer itself instead.
+
+ * dom/Element.cpp:
+ (WebCore::layoutOverflowRectContainsAllDescendants): This expects ancestor containing block.
+ * rendering/LogicalSelectionOffsetCaches.h:
+ (WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches):
+ * rendering/RenderElement.cpp:
+ (WebCore::containingBlockForFixedPosition):
+ (WebCore::containingBlockForAbsolutePosition):
+ (WebCore::containingBlockForObjectInFlow):
+ * rendering/RenderElement.h:
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::styleWillChange):
+ * rendering/RenderLineBreak.cpp:
+ (WebCore::RenderLineBreak::collectSelectionRects): Not a behaviour change.
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::containingBlock): RenderScrollbarPart renderer now returns
+ the containing block based on its owning renderer's style.
+
</ins><span class="cx"> 2016-05-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r192098): Content missing after copy and paste to Notes App on retina displays
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (200952 => 200953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-05-16 18:26:32 UTC (rev 200952)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-05-16 18:44:02 UTC (rev 200953)
</span><span class="lines">@@ -976,7 +976,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This renderer may have positioned descendants whose containing block is some ancestor.
</span><del>- if (auto containingBlock = containingBlockForAbsolutePosition(&renderer)) {
</del><ins>+ if (auto containingBlock = renderer.containingBlockForAbsolutePosition()) {
</ins><span class="cx"> if (auto positionedObjects = containingBlock->positionedObjects()) {
</span><span class="cx"> for (RenderBox* it : *positionedObjects) {
</span><span class="cx"> if (it != &renderer && renderer.element()->contains(it->element()))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLogicalSelectionOffsetCachesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h (200952 => 200953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h 2016-05-16 18:26:32 UTC (rev 200952)
+++ trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h 2016-05-16 18:44:02 UTC (rev 200953)
</span><span class="lines">@@ -88,12 +88,10 @@
</span><span class="cx"> // such that we can remove this assertion.
</span><span class="cx"> ASSERT(rootBlock.isSelectionRoot());
</span><span class="cx"> #endif
</span><del>- auto parent = rootBlock.parent();
-
</del><span class="cx"> // LogicalSelectionOffsetCaches should not be used on an orphaned tree.
</span><del>- m_containingBlockForFixedPosition.setBlock(containingBlockForFixedPosition(parent), nullptr);
- m_containingBlockForAbsolutePosition.setBlock(containingBlockForAbsolutePosition(parent), nullptr);
- m_containingBlockForInflowPosition.setBlock(containingBlockForObjectInFlow(parent), nullptr);
</del><ins>+ m_containingBlockForFixedPosition.setBlock(rootBlock.containingBlockForFixedPosition(), nullptr);
+ m_containingBlockForAbsolutePosition.setBlock(rootBlock.containingBlockForAbsolutePosition(), nullptr);
+ m_containingBlockForInflowPosition.setBlock(rootBlock.containingBlockForObjectInFlow(), nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LogicalSelectionOffsetCaches(RenderBlock& block, const LogicalSelectionOffsetCaches& cache)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (200952 => 200953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-05-16 18:26:32 UTC (rev 200952)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-05-16 18:44:02 UTC (rev 200953)
</span><span class="lines">@@ -2243,41 +2243,4 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx">
</span><del>-RenderBlock* containingBlockForFixedPosition(const RenderElement* element)
-{
- const auto* object = element;
- while (object && !object->canContainFixedPositionObjects())
- object = object->parent();
-
- ASSERT(!object || !object->isAnonymousBlock());
- return const_cast<RenderBlock*>(downcast<RenderBlock>(object));
</del><span class="cx"> }
</span><del>-
-RenderBlock* containingBlockForAbsolutePosition(const RenderElement* element)
-{
- const auto* object = element;
- while (object && !object->canContainAbsolutelyPositionedObjects())
- object = object->parent();
-
- // For a relatively positioned inline, return its nearest non-anonymous containing block,
- // not the inline itself, to avoid having a positioned objects list in all RenderInlines
- // and use RenderBlock* as RenderElement::containingBlock's return type.
- // Use RenderBlock::container() to obtain the inline.
- if (object && !is<RenderBlock>(*object))
- object = object->containingBlock();
-
- while (object && object->isAnonymousBlock())
- object = object->containingBlock();
-
- return const_cast<RenderBlock*>(downcast<RenderBlock>(object));
-}
-
-RenderBlock* containingBlockForObjectInFlow(const RenderElement* element)
-{
- const auto* object = element;
- while (object && ((object->isInline() && !object->isReplaced()) || !object->isRenderBlock()))
- object = object->parent();
- return const_cast<RenderBlock*>(downcast<RenderBlock>(object));
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (200952 => 200953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2016-05-16 18:26:32 UTC (rev 200952)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-05-16 18:44:02 UTC (rev 200953)
</span><span class="lines">@@ -488,9 +488,6 @@
</span><span class="cx"> return adjustLayoutUnitForAbsoluteZoom(value, renderer.style());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderBlock* containingBlockForFixedPosition(const RenderElement*);
-RenderBlock* containingBlockForAbsolutePosition(const RenderElement*);
-RenderBlock* containingBlockForObjectInFlow(const RenderElement*);
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderElement, isRenderElement())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (200952 => 200953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2016-05-16 18:26:32 UTC (rev 200952)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2016-05-16 18:44:02 UTC (rev 200953)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> // Check if this inline can hold absolute positioned elmements even after the style change.
</span><span class="cx"> if (canContainAbsolutelyPositionedObjects() && newStyle.position() == StaticPosition) {
</span><span class="cx"> // RenderInlines forward their absolute positioned descendants to their (non-anonymous) containing block.
</span><del>- auto* container = containingBlockForAbsolutePosition(this);
</del><ins>+ auto* container = containingBlockForAbsolutePosition();
</ins><span class="cx"> if (container && !container->canContainAbsolutelyPositionedObjects())
</span><span class="cx"> container->removePositionedObjects(nullptr, NewContainingBlock);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLineBreakcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLineBreak.cpp (200952 => 200953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLineBreak.cpp 2016-05-16 18:26:32 UTC (rev 200952)
+++ trunk/Source/WebCore/rendering/RenderLineBreak.cpp 2016-05-16 18:44:02 UTC (rev 200953)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> rect.shiftXEdgeTo(rootBox.lineTopWithLeading());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto* containingBlock = containingBlockForObjectInFlow(this);
</del><ins>+ auto* containingBlock = containingBlockForObjectInFlow();
</ins><span class="cx"> // Map rect, extended left to leftOffset, and right to rightOffset, through transforms to get minX and maxX.
</span><span class="cx"> LogicalSelectionOffsetCaches cache(*containingBlock);
</span><span class="cx"> LayoutUnit leftOffset = containingBlock->logicalLeftSelectionOffset(*containingBlock, box->logicalTop(), cache);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (200952 => 200953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2016-05-16 18:26:32 UTC (rev 200952)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2016-05-16 18:44:02 UTC (rev 200953)
</span><span class="lines">@@ -622,21 +622,66 @@
</span><span class="cx">
</span><span class="cx"> RenderBlock* RenderObject::containingBlock() const
</span><span class="cx"> {
</span><del>- auto* parent = this->parent();
</del><ins>+ auto containingBlockForRenderer = [](const RenderObject& renderer)
+ {
+ auto& style = renderer.style();
+ if (style.position() == AbsolutePosition)
+ return renderer.containingBlockForAbsolutePosition();
+ if (style.position() == FixedPosition)
+ return renderer.containingBlockForFixedPosition();
+ return renderer.containingBlockForObjectInFlow();
+ };
+
</ins><span class="cx"> if (is<RenderText>(*this))
</span><del>- return containingBlockForObjectInFlow(parent);
</del><ins>+ return containingBlockForObjectInFlow();
</ins><span class="cx">
</span><del>- if (!parent && is<RenderScrollbarPart>(*this))
- parent = downcast<RenderScrollbarPart>(*this).rendererOwningScrollbar();
</del><ins>+ if (!parent() && is<RenderScrollbarPart>(*this)) {
+ if (auto* renderer = downcast<RenderScrollbarPart>(*this).rendererOwningScrollbar())
+ return containingBlockForRenderer(*renderer);
+ return nullptr;
+ }
+ return containingBlockForRenderer(*this);
+}
</ins><span class="cx">
</span><del>- auto& style = this->style();
- if (style.position() == AbsolutePosition)
- return containingBlockForAbsolutePosition(parent);
- if (style.position() == FixedPosition)
- return containingBlockForFixedPosition(parent);
- return containingBlockForObjectInFlow(parent);
</del><ins>+RenderBlock* RenderObject::containingBlockForFixedPosition() const
+{
+ auto* renderer = parent();
+ while (renderer && !renderer->canContainFixedPositionObjects())
+ renderer = renderer->parent();
+
+ ASSERT(!renderer || !renderer->isAnonymousBlock());
+ return downcast<RenderBlock>(renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderBlock* RenderObject::containingBlockForAbsolutePosition() const
+{
+ // RenderInlines forward their absolute positioned descendants to the containing block, so
+ // we need to start searching from 'this' and not from 'parent()'.
+ auto* renderer = isRenderInline() ? const_cast<RenderElement*>(downcast<RenderElement>(this)) : parent();
+ while (renderer && !renderer->canContainAbsolutelyPositionedObjects())
+ renderer = renderer->parent();
+
+ // For a relatively positioned inline, return its nearest non-anonymous containing block,
+ // not the inline itself, to avoid having a positioned objects list in all RenderInlines
+ // and use RenderBlock* as RenderElement::containingBlock's return type.
+ // Use RenderBlock::container() to obtain the inline.
+ if (renderer && !is<RenderBlock>(*renderer))
+ renderer = renderer->containingBlock();
+
+ while (renderer && renderer->isAnonymousBlock())
+ renderer = renderer->containingBlock();
+
+ return downcast<RenderBlock>(renderer);
+}
+
+RenderBlock* RenderObject::containingBlockForObjectInFlow() const
+{
+ auto* renderer = parent();
+ while (renderer && ((renderer->isInline() && !renderer->isReplaced()) || !renderer->isRenderBlock()))
+ renderer = renderer->parent();
+ return downcast<RenderBlock>(renderer);
+}
+
</ins><span class="cx"> void RenderObject::addPDFURLRect(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><span class="cx"> Vector<LayoutRect> focusRingRects;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (200952 => 200953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2016-05-16 18:26:32 UTC (rev 200952)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2016-05-16 18:44:02 UTC (rev 200953)
</span><span class="lines">@@ -647,6 +647,9 @@
</span><span class="cx">
</span><span class="cx"> // returns the containing block level element for this element.
</span><span class="cx"> RenderBlock* containingBlock() const;
</span><ins>+ RenderBlock* containingBlockForFixedPosition() const;
+ RenderBlock* containingBlockForAbsolutePosition() const;
+ RenderBlock* containingBlockForObjectInFlow() const;
</ins><span class="cx">
</span><span class="cx"> // Convert the given local point to absolute coordinates. If MapCoordinatesFlags includes UseTransforms, take transforms into account.
</span><span class="cx"> WEBCORE_EXPORT FloatPoint localToAbsolute(const FloatPoint& localPoint = FloatPoint(), MapCoordinatesFlags = 0, bool* wasFixed = nullptr) const;
</span></span></pre>
</div>
</div>
</body>
</html>