<!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>[200162] 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/200162">200162</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2016-04-27 16:53:08 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor findExplodedTextNodeAtPoint to move core functionality in RenderBlockFlow.
https://bugs.webkit.org/show_bug.cgi?id=157076
Reviewed by Simon Fraser.
* bindings/objc/DOMUIKitExtensions.mm:
(-[DOMNode findExplodedTextNodeAtPoint:]):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::findClosestTextAtAbsolutePoint):
* rendering/RenderBlockFlow.h:
* rendering/RenderText.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMUIKitExtensionsmm">trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTexth">trunk/Source/WebCore/rendering/RenderText.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200161 => 200162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-27 23:51:40 UTC (rev 200161)
+++ trunk/Source/WebCore/ChangeLog 2016-04-27 23:53:08 UTC (rev 200162)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-27 Enrica Casucci <enrica@apple.com>
+
+ Refactor findExplodedTextNodeAtPoint to move core functionality in RenderBlockFlow.
+ https://bugs.webkit.org/show_bug.cgi?id=157076
+
+ Reviewed by Simon Fraser.
+
+ * bindings/objc/DOMUIKitExtensions.mm:
+ (-[DOMNode findExplodedTextNodeAtPoint:]):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::findClosestTextAtAbsolutePoint):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderText.h:
+
</ins><span class="cx"> 2016-04-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] When determining tile size, check whether ancestor UIScrollViews are actually scrollable
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMUIKitExtensionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm (200161 => 200162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm 2016-04-27 23:51:40 UTC (rev 200161)
+++ trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm 2016-04-27 23:53:08 UTC (rev 200162)
</span><span class="lines">@@ -253,75 +253,16 @@
</span><span class="cx">
</span><span class="cx"> - (DOMNode *)findExplodedTextNodeAtPoint:(CGPoint)point
</span><span class="cx"> {
</span><del>- // A light, non-recursive version of RenderBlock::positionForCoordinates that looks at
- // whether a point lies within the gaps between its root line boxes, to be called against
- // a node returned from elementAtPoint. We make the assumption that either the node or one
- // of its immediate children contains the root line boxes in question.
- // See <rdar://problem/6824650> for context.
</del><span class="cx"> RenderObject* renderer = core(self)->renderer();
</span><span class="cx"> if (!is<RenderBlockFlow>(renderer))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- RenderBlock* block = downcast<RenderBlockFlow>(renderer);
-
- FloatPoint absPoint(point);
- FloatPoint localPoint = block->absoluteToLocal(absPoint);
</del><ins>+ RenderBlockFlow* block = downcast<RenderBlockFlow>(renderer);
+ RenderText* renderText = block->findClosestTextAtAbsolutePoint(point);
+ if (renderText && renderText->textNode())
+ return kit(renderText->textNode());
</ins><span class="cx">
</span><del>- if (!block->childrenInline()) {
- // Look among our immediate children for an alternate box that contains the point.
- for (RenderBox* child = block->firstChildBox(); child; child = child->nextSiblingBox()) {
- if (child->height() == 0 || child->style().visibility() != WebCore::VISIBLE || child->isFloatingOrOutOfFlowPositioned())
- continue;
- float top = child->y();
-
- RenderBox* nextChild = child->nextSiblingBox();
- while (nextChild && nextChild->isFloatingOrOutOfFlowPositioned())
- nextChild = nextChild->nextSiblingBox();
- if (!nextChild) {
- if (localPoint.y() >= top) {
- block = downcast<RenderBlock>(child);
- break;
- }
- continue;
- }
-
- float bottom = nextChild->y();
-
- if (localPoint.y() >= top && localPoint.y() < bottom && is<RenderBlock>(*child)) {
- block = downcast<RenderBlock>(child);
- break;
- }
- }
-
- if (!block->childrenInline())
- return nil;
-
- localPoint = block->absoluteToLocal(absPoint);
- }
-
- RenderBlockFlow& blockFlow = downcast<RenderBlockFlow>(*block);
-
- // Only check the gaps between the root line boxes. We deliberately ignore overflow because
- // experience has shown that hit tests on an exploded text node can fail when within the
- // overflow region.
- for (RootInlineBox* current = blockFlow.firstRootBox(); current && current != blockFlow.lastRootBox(); current = current->nextRootBox()) {
- float currentBottom = current->y() + current->logicalHeight();
- if (localPoint.y() < currentBottom)
- return nil;
-
- RootInlineBox* next = current->nextRootBox();
- float nextTop = next->y();
- if (localPoint.y() < nextTop) {
- InlineBox* inlineBox = current->closestLeafChildForLogicalLeftPosition(localPoint.x());
- if (inlineBox && inlineBox->behavesLikeText() && is<RenderText>(inlineBox->renderer())) {
- RenderText& renderText = downcast<RenderText>(inlineBox->renderer());
- if (renderText.textNode())
- return kit(renderText.textNode());
- }
- }
-
- }
- return nil;
</del><ins>+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (200161 => 200162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-04-27 23:51:40 UTC (rev 200161)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-04-27 23:53:08 UTC (rev 200162)
</span><span class="lines">@@ -3356,6 +3356,71 @@
</span><span class="cx"> return createLegacyEditingPosition(textBox.renderer().nonPseudoNode(), start ? textBox.start() : textBox.start() + textBox.len());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderText* RenderBlockFlow::findClosestTextAtAbsolutePoint(const FloatPoint& point)
+{
+ // A light, non-recursive version of RenderBlock::positionForCoordinates that looks at
+ // whether a point lies within the gaps between its root line boxes, to be called against
+ // a node returned from elementAtPoint. We make the assumption that either the node or one
+ // of its immediate children contains the root line boxes in question.
+ // See <rdar://problem/6824650> for context.
+
+ RenderBlock* block = this;
+
+ FloatPoint localPoint = block->absoluteToLocal(point);
+
+ if (!block->childrenInline()) {
+ // Look among our immediate children for an alternate box that contains the point.
+ for (RenderBox* child = block->firstChildBox(); child; child = child->nextSiblingBox()) {
+ if (!child->height() || child->style().visibility() != WebCore::VISIBLE || child->isFloatingOrOutOfFlowPositioned())
+ continue;
+ float top = child->y();
+
+ RenderBox* nextChild = child->nextSiblingBox();
+ while (nextChild && nextChild->isFloatingOrOutOfFlowPositioned())
+ nextChild = nextChild->nextSiblingBox();
+ if (!nextChild) {
+ if (localPoint.y() >= top) {
+ block = downcast<RenderBlock>(child);
+ break;
+ }
+ continue;
+ }
+
+ float bottom = nextChild->y();
+
+ if (localPoint.y() >= top && localPoint.y() < bottom && is<RenderBlock>(*child)) {
+ block = downcast<RenderBlock>(child);
+ break;
+ }
+ }
+
+ if (!block->childrenInline())
+ return nullptr;
+
+ localPoint = block->absoluteToLocal(point);
+ }
+
+ RenderBlockFlow& blockFlow = downcast<RenderBlockFlow>(*block);
+
+ // Only check the gaps between the root line boxes. We deliberately ignore overflow because
+ // experience has shown that hit tests on an exploded text node can fail when within the
+ // overflow region.
+ for (RootInlineBox* current = blockFlow.firstRootBox(); current && current != blockFlow.lastRootBox(); current = current->nextRootBox()) {
+ float currentBottom = current->y() + current->logicalHeight();
+ if (localPoint.y() < currentBottom)
+ return nullptr;
+
+ RootInlineBox* next = current->nextRootBox();
+ float nextTop = next->y();
+ if (localPoint.y() < nextTop) {
+ InlineBox* inlineBox = current->closestLeafChildForLogicalLeftPosition(localPoint.x());
+ if (inlineBox && inlineBox->behavesLikeText() && is<RenderText>(inlineBox->renderer()))
+ return &downcast<RenderText>(inlineBox->renderer());
+ }
+ }
+ return nullptr;
+}
+
</ins><span class="cx"> VisiblePosition RenderBlockFlow::positionForPointWithInlineChildren(const LayoutPoint& pointInLogicalContents, const RenderRegion* region)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(childrenInline());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (200161 => 200162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-04-27 23:51:40 UTC (rev 200161)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-04-27 23:53:08 UTC (rev 200162)
</span><span class="lines">@@ -394,6 +394,7 @@
</span><span class="cx"> void updateStylesForColumnChildren();
</span><span class="cx">
</span><span class="cx"> bool needsLayoutAfterRegionRangeChange() const override;
</span><ins>+ WEBCORE_EXPORT RenderText* findClosestTextAtAbsolutePoint(const FloatPoint&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.h (200161 => 200162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.h 2016-04-27 23:51:40 UTC (rev 200161)
+++ trunk/Source/WebCore/rendering/RenderText.h 2016-04-27 23:53:08 UTC (rev 200162)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> const char* renderName() const override;
</span><span class="cx">
</span><del>- Text* textNode() const;
</del><ins>+ WEBCORE_EXPORT Text* textNode() const;
</ins><span class="cx">
</span><span class="cx"> virtual bool isTextFragment() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>