<!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>[168263] trunk</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/168263">168263</a></dd>
<dt>Author</dt> <dd>abucur@adobe.com</dd>
<dt>Date</dt> <dd>2014-05-05 01:01:13 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] ASSERT when hovering over region
https://bugs.webkit.org/show_bug.cgi?id=128809
Reviewed by Mihnea Ovidenie.
Source/WebCore:
There's no point in hit-testing a box for a region if it's not contained inside
that region.
Test: fast/regions/hit-test-box-non-containing-region.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::nodeAtPoint):
LayoutTests:
Add a test verifying we're not trying to hit-test a box inside a region
where it's not contained.
* fast/regions/hit-test-box-non-containing-region-expected.txt: Added.
* fast/regions/hit-test-box-non-containing-region.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionshittestboxnoncontainingregionexpectedtxt">trunk/LayoutTests/fast/regions/hit-test-box-non-containing-region-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastregionshittestboxnoncontainingregionhtml">trunk/LayoutTests/fast/regions/hit-test-box-non-containing-region.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168262 => 168263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-05 07:53:36 UTC (rev 168262)
+++ trunk/LayoutTests/ChangeLog 2014-05-05 08:01:13 UTC (rev 168263)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-05 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] ASSERT when hovering over region
+ https://bugs.webkit.org/show_bug.cgi?id=128809
+
+ Reviewed by Mihnea Ovidenie.
+
+ Add a test verifying we're not trying to hit-test a box inside a region
+ where it's not contained.
+
+ * fast/regions/hit-test-box-non-containing-region-expected.txt: Added.
+ * fast/regions/hit-test-box-non-containing-region.html: Added.
+
</ins><span class="cx"> 2014-05-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r168254.
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionshittestboxnoncontainingregionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/hit-test-box-non-containing-region-expected.txt (0 => 168263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/hit-test-box-non-containing-region-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/regions/hit-test-box-non-containing-region-expected.txt 2014-05-05 08:01:13 UTC (rev 168263)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionshittestboxnoncontainingregionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/hit-test-box-non-containing-region.html (0 => 168263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/hit-test-box-non-containing-region.html (rev 0)
+++ trunk/LayoutTests/fast/regions/hit-test-box-non-containing-region.html 2014-05-05 08:01:13 UTC (rev 168263)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>[128809][CSS Regions] ASSERT when hovering over region</title>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <style>
+ #region1, #region2 {
+ -webkit-flow-from: article;
+ float: left;
+ width: 300px;
+ height: 300px;
+ border: 1px solid green;
+ }
+
+ #region2 {
+ height: auto;
+ }
+
+ p {
+ margin-top: 0px;
+ }
+
+ #content {
+ -webkit-flow-into: article;
+ }
+
+ #breakAfter {
+ -webkit-region-break-after: always;
+ }
+
+ #marginBefore {
+ margin-top: 200px;
+ }
+
+ .pass #region1, .pass #region2, .pass #content {
+ display: none;
+ }
+ </style>
+ </head>
+ <body>
+ <div id="region1"></div>
+ <div id="region2"></div>
+ <article id="content">
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Numquam quo
+ perferendis beatae sequi consequatur neque possimus dicta necessitatibus
+ qui nam. Et obcaecati iusto tempora voluptatum id esse qui commodi
+ illo.
+ </p>
+ <img src="" style="float:right" height="10" width="10">
+ <p id="breakAfter">
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Numquam quo
+ perferendis beatae sequi consequatur neque possimus dicta necessitatibus
+ qui nam. Et obcaecati iusto tempora voluptatum id esse qui commodi
+ illo.
+ </p>
+ <p id="marginBefore">
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Numquam quo
+ perferendis beatae sequi consequatur neque possimus dicta necessitatibus
+ qui nam. Et obcaecati iusto tempora voluptatum id esse qui commodi
+ illo.
+ </p>
+ </article>
+ <div id="console"></div>
+ <script type="text/javascript">
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ document.elementFromPoint(350, 100);
+ document.body.className = "pass";
+ document.getElementById("console").innerText = "PASS";
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168262 => 168263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-05 07:53:36 UTC (rev 168262)
+++ trunk/Source/WebCore/ChangeLog 2014-05-05 08:01:13 UTC (rev 168263)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-05 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] ASSERT when hovering over region
+ https://bugs.webkit.org/show_bug.cgi?id=128809
+
+ Reviewed by Mihnea Ovidenie.
+
+ There's no point in hit-testing a box for a region if it's not contained inside
+ that region.
+
+ Test: fast/regions/hit-test-box-non-containing-region.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::nodeAtPoint):
+
</ins><span class="cx"> 2014-05-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Optimize JSRopeString for resolving directly to AtomicString.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (168262 => 168263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-05-05 07:53:36 UTC (rev 168262)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-05-05 08:01:13 UTC (rev 168263)
</span><span class="lines">@@ -1127,9 +1127,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ RenderRegion* regionToUse = locationInContainer.region();
+ if (regionToUse) {
+ RenderFlowThread* flowThread = regionToUse->flowThread();
+
+ // If the box is not contained by this region there's no point in going further.
+ if (!flowThread->objectShouldFragmentInFlowRegion(this, regionToUse))
+ return false;
+ }
+
</ins><span class="cx"> // Check our bounds next. For this purpose always assume that we can only be hit in the
</span><span class="cx"> // foreground phase (which is true for replaced elements like images).
</span><del>- LayoutRect boundsRect = borderBoxRectInRegion(locationInContainer.region());
</del><ins>+ LayoutRect boundsRect = borderBoxRectInRegion(regionToUse);
</ins><span class="cx"> boundsRect.moveBy(adjustedLocation);
</span><span class="cx"> if (visibleToHitTesting() && action == HitTestForeground && locationInContainer.intersects(boundsRect)) {
</span><span class="cx"> updateHitTestResult(result, locationInContainer.point() - toLayoutSize(adjustedLocation));
</span></span></pre>
</div>
</div>
</body>
</html>