<!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>[167910] 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/167910">167910</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2014-04-28 15:35:24 -0700 (Mon, 28 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[New Multicolumn] event.offsetX/offsetY don't work correctly
https://bugs.webkit.org/show_bug.cgi?id=132284
Reviewed by Simon Fraser.
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::mapAbsoluteToLocalPoint):
Change the code here to only trigger for CSS Regions and not for
multi-column. Add a FIXME pointing out that the code is broken even for
CSS regions.
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::RenderMultiColumnFlowThread::mapAbsoluteToLocalPoint):
Override mapAbsoluteToLocalPoint in order to guess a region and attempt
to translate the point from that region to the flow thread local coordinate
space.
(WebCore::RenderMultiColumnFlowThread::physicalTranslationFromRegionToFlow):
* rendering/RenderMultiColumnFlowThread.h:
New helper function that just wraps calling the region's logical translation
function and converting to/from physical coordinates.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167909 => 167910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-28 22:00:28 UTC (rev 167909)
+++ trunk/Source/WebCore/ChangeLog 2014-04-28 22:35:24 UTC (rev 167910)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-04-28 David Hyatt <hyatt@apple.com>
+
+ [New Multicolumn] event.offsetX/offsetY don't work correctly
+ https://bugs.webkit.org/show_bug.cgi?id=132284
+
+ Reviewed by Simon Fraser.
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::mapAbsoluteToLocalPoint):
+ Change the code here to only trigger for CSS Regions and not for
+ multi-column. Add a FIXME pointing out that the code is broken even for
+ CSS regions.
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::RenderMultiColumnFlowThread::mapAbsoluteToLocalPoint):
+ Override mapAbsoluteToLocalPoint in order to guess a region and attempt
+ to translate the point from that region to the flow thread local coordinate
+ space.
+
+ (WebCore::RenderMultiColumnFlowThread::physicalTranslationFromRegionToFlow):
+ * rendering/RenderMultiColumnFlowThread.h:
+ New helper function that just wraps calling the region's logical translation
+ function and converting to/from physical coordinates.
+
</ins><span class="cx"> 2014-04-28 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r167857.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (167909 => 167910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-04-28 22:00:28 UTC (rev 167909)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-04-28 22:35:24 UTC (rev 167910)
</span><span class="lines">@@ -2637,10 +2637,13 @@
</span><span class="cx"> auto o = container();
</span><span class="cx"> if (!o)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ // FIXME: This code is wrong for named flow threads since it only works for content in the first region.
+ // We also don't want to run it for multicolumn flow threads, since we can use our knowledge of column
+ // geometry to actually get a better result.
</ins><span class="cx"> // The point inside a box that's inside a region has its coordinates relative to the region,
</span><span class="cx"> // not the FlowThread that is its container in the RenderObject tree.
</span><del>- if (o->isRenderFlowThread() && isBox()) {
</del><ins>+ if (isBox() && o->isOutOfFlowRenderFlowThread()) {
</ins><span class="cx"> RenderRegion* startRegion = nullptr;
</span><span class="cx"> RenderRegion* endRegion = nullptr;
</span><span class="cx"> if (toRenderFlowThread(o)->getRegionRangeForBox(toRenderBox(this), startRegion, endRegion))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (167909 => 167910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-04-28 22:00:28 UTC (rev 167909)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-04-28 22:35:24 UTC (rev 167910)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "LayoutState.h"
</span><ins>+#include "RenderIterator.h"
</ins><span class="cx"> #include "RenderMultiColumnSet.h"
</span><span class="cx"> #include "RenderMultiColumnSpannerPlaceholder.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="lines">@@ -582,6 +583,49 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderMultiColumnFlowThread::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const
+{
+ // First get the transform state's point into the block flow thread's physical coordinate space.
+ parent()->mapAbsoluteToLocalPoint(mode, transformState);
+ LayoutPoint transformPoint = roundedLayoutPoint(transformState.mappedPoint());
+
+ // Now walk through each region.
+ const RenderMultiColumnSet* candidateColumnSet = nullptr;
+ LayoutPoint candidatePoint;
+
+ for (const auto& columnSet : childrenOfType<RenderMultiColumnSet>(*parent())) {
+ LayoutSize containerOffset = columnSet.offsetFromContainer(parent(), LayoutPoint());
+
+ candidatePoint = transformPoint - containerOffset;
+ candidateColumnSet = &columnSet;
+
+ // We really have no clue what to do with overflow. We'll just use the closest region to the point in that case.
+ LayoutUnit pointOffset = isHorizontalWritingMode() ? candidatePoint.y() : candidatePoint.x();
+ LayoutUnit regionOffset = isHorizontalWritingMode() ? columnSet.topLeftLocation().y() : columnSet.topLeftLocation().x();
+ if (pointOffset < regionOffset + columnSet.logicalHeight())
+ break;
+ }
+
+ // Once we have a good guess as to which region we hit tested through (and yes, this was just a heuristic, but it's
+ // the best we could do), then we can map from the region into the flow thread.
+ LayoutSize translationOffset = physicalTranslationFromRegionToFlow(candidateColumnSet, candidatePoint);
+ bool preserve3D = mode & UseTransforms && (parent()->style().preserves3D() || style().preserves3D());
+ if (mode & UseTransforms && shouldUseTransformFromContainer(parent())) {
+ TransformationMatrix t;
+ getTransformFromContainer(parent(), translationOffset, t);
+ transformState.applyTransform(t, preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform);
+ } else
+ transformState.move(translationOffset.width(), translationOffset.height(), preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform);
+}
+
+LayoutSize RenderMultiColumnFlowThread::physicalTranslationFromRegionToFlow(const RenderMultiColumnSet* columnSet, const LayoutPoint& physicalPoint) const
+{
+ LayoutPoint logicalPoint = columnSet->flipForWritingMode(physicalPoint);
+ LayoutPoint translatedPoint = columnSet->translateRegionPointToFlowThread(logicalPoint);
+ LayoutPoint physicalTranslatedPoint = columnSet->flipForWritingMode(translatedPoint);
+ return physicalPoint - physicalTranslatedPoint;
+}
+
</ins><span class="cx"> RenderRegion* RenderMultiColumnFlowThread::mapFromFlowToRegion(TransformState& transformState) const
</span><span class="cx"> {
</span><span class="cx"> if (!hasValidRegionInfo())
</span><span class="lines">@@ -604,7 +648,6 @@
</span><span class="cx">
</span><span class="cx"> LayoutSize RenderMultiColumnFlowThread::physicalTranslationOffsetFromFlowToRegion(const RenderRegion* renderRegion, const LayoutUnit logicalOffset) const
</span><span class="cx"> {
</span><del>-
</del><span class="cx"> // Now that we know which multicolumn set we hit, we need to get the appropriate translation offset for the column.
</span><span class="cx"> const RenderMultiColumnSet* columnSet = toRenderMultiColumnSet(renderRegion);
</span><span class="cx"> LayoutPoint translationOffset = columnSet->columnTranslationForOffset(logicalOffset);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h (167909 => 167910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2014-04-28 22:00:28 UTC (rev 167909)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2014-04-28 22:35:24 UTC (rev 167910)
</span><span class="lines">@@ -103,8 +103,13 @@
</span><span class="cx"> // The point is physical, and the result is a physical location within the region.
</span><span class="cx"> RenderRegion* physicalTranslationFromFlowToRegion(LayoutPoint&) const;
</span><span class="cx">
</span><ins>+ // This method is the inverse of the previous method and goes from region to flow.
+ LayoutSize physicalTranslationFromRegionToFlow(const RenderMultiColumnSet*, const LayoutPoint&) const;
+
</ins><span class="cx"> virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
</span><del>-
</del><ins>+
+ virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const override;
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual const char* renderName() const override;
</span><span class="cx"> virtual void addRegionToThread(RenderRegion*) override;
</span></span></pre>
</div>
</div>
</body>
</html>