<!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>[208164] branches/safari-602-branch</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/208164">208164</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-31 11:43:36 -0700 (Mon, 31 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208003">r208003</a>. rdar://problem/28811878</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestsplatformeflTestExpectations">branches/safari-602-branch/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#branchessafari602branchLayoutTestsplatformgtkTestExpectations">branches/safari-602-branch/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#branchessafari602branchLayoutTestsplatformiossimulatorTestExpectations">branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#branchessafari602branchLayoutTestsplatformwinTestExpectations">branches/safari-602-branch/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoredomDocumentcpp">branches/safari-602-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageEventHandlercpp">branches/safari-602-branch/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageFrameViewcpp">branches/safari-602-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderViewcpp">branches/safari-602-branch/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderViewh">branches/safari-602-branch/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsfastlayerspreventhittestduringlayoutexpectedtxt">branches/safari-602-branch/LayoutTests/fast/layers/prevent-hit-test-during-layout-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsfastlayerspreventhittestduringlayouthtml">branches/safari-602-branch/LayoutTests/fast/layers/prevent-hit-test-during-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-31 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r208003. rdar://problem/28811878
+
+ 2016-10-25 Brent Fulgham <bfulgham@apple.com>
+
+ Prevent hit tests from being performed on an invalid render tree
+ https://bugs.webkit.org/show_bug.cgi?id=163877
+ <rdar://problem/28675761>
+
+ Reviewed by Simon Fraser.
+
+ * fast/layers/prevent-hit-test-during-layout-expected.txt: Added.
+ * fast/layers/prevent-hit-test-during-layout.html: Added.
+ * platform/efl/TestExpectations: Skip on this platform.
+ * platform/gtk/TestExpectations: Skip on this platform.
+ * platform/ios-simulator/TestExpectations: Skip on this platform.
+ * platform/win/TestExpectations: Skip on this platform.
+
</ins><span class="cx"> 2016-10-31 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r207639. rdar://problem/29007088
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastlayerspreventhittestduringlayoutexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/layers/prevent-hit-test-during-layout-expected.txt (0 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/layers/prevent-hit-test-during-layout-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/layers/prevent-hit-test-during-layout-expected.txt 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This tests makes sure that hit tests are not processed while laying out the page.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
+
+This test passes if it did not crash.
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastlayerspreventhittestduringlayouthtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/layers/prevent-hit-test-during-layout.html (0 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/layers/prevent-hit-test-during-layout.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/layers/prevent-hit-test-during-layout.html 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ var fixedDiv;
+ var target;
+
+ if (window.testRunner) {
+ description("This tests makes sure that hit tests are not processed while laying out the page.");
+ testRunner.waitUntilDone();
+ }
+
+ function triggerHitTest() {
+ var spanRects = target.getClientRects();
+
+ if (spanRects.count > 1) {
+ document.body.innerHTML += "<br/>ERROR: More than one rect for hit word."
+ testRunner.notifyDone();
+ return;
+ }
+
+ var rect = spanRects[0];
+ var x = rect.left + rect.width / 2;
+ var y = rect.top + rect.height / 2;
+
+ // This internal test call is used because it is guaranteed to trigger
+ // a recursive hit test. Dictionary lookup itself is not required for this test.
+ var lookupRange = internals.rangeForDictionaryLookupAtLocation(x, y);
+
+ document.body.innerHTML += "<br/>This test passes if it did not crash.";
+ testRunner.notifyDone();
+ }
+
+ function runTest() {
+ fixedDiv = window.frames['fixedFrame'].document.getElementById('fixedDiv');
+ target = document.getElementById('target');
+
+ setTimeout(function() {
+ fixedDiv.style.position = "relative";
+ triggerHitTest();
+ }, 0);
+ }
+ </script>
+</head>
+<body onload="runTest()">
+ <div>
+ <iframe id="fixedFrame" src='data:text/html,
+ <div id="fixedDiv" style="position:fixed; left:10px; top:10px">Fixed Frame.</div>'>
+ </iframe>
+ <iframe id="target" src='data:text/html,<div>Second Frame.</div>'></iframe>
+ <iframe src='data:text/html,<div>Third Frame.</div>'></iframe>
+ </div>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/platform/efl/TestExpectations (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/efl/TestExpectations 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/LayoutTests/platform/efl/TestExpectations 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -560,6 +560,9 @@
</span><span class="cx"> # Need a new baseline for EFL port. It was added by r72173.
</span><span class="cx"> Bug(EFL) fast/css/line-height-determined-by-primary-font.html [ Failure ]
</span><span class="cx">
</span><ins>+# Only Mac has implemented DictionaryLookup
+fast/layers/prevent-hit-test-during-layout.html [ Skip ]
+
</ins><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # CRASHES
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/platform/gtk/TestExpectations (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/gtk/TestExpectations 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/LayoutTests/platform/gtk/TestExpectations 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -1669,6 +1669,9 @@
</span><span class="cx"> webkit.org/b/152247 fast/forms/input-appearance-spinbutton.html [ Skip ]
</span><span class="cx"> webkit.org/b/152247 fast/forms/listbox-scrollbar-hit-test.html [ Skip ]
</span><span class="cx">
</span><ins>+# Only Mac has implemented DictionaryLookup
+fast/layers/prevent-hit-test-during-layout.html [ Skip ]
+
</ins><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End of tests with architecture-specific results
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -2979,4 +2979,7 @@
</span><span class="cx"> webkit.org/b/163291 media/video-controls-visible-audio-only.html [ Failure ]
</span><span class="cx"> webkit.org/b/163291 media/video-fullscreeen-only-playback.html [ Failure ]
</span><span class="cx"> webkit.org/b/163291 media/video-play-audio-require-user-gesture.html [ Failure ]
</span><del>-webkit.org/b/163291 media/video-play-require-user-gesture.html
</del><span class="cx">\ No newline at end of file
</span><ins>+webkit.org/b/163291 media/video-play-require-user-gesture.html
+
+# Only Mac has implemented DictionaryLookup
+fast/layers/prevent-hit-test-during-layout.html [ Skip ]
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/platform/win/TestExpectations (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/win/TestExpectations 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/LayoutTests/platform/win/TestExpectations 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -3347,3 +3347,6 @@
</span><span class="cx"> # These tests hardcode platform-specific font aliases.
</span><span class="cx"> webkit.org/b/158649 fast/text/chinese-font-name-aliases.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/158649 fast/text/chinese-font-name-aliases-2.html [ ImageOnlyFailure ]
</span><ins>+
+# Only Mac has implemented DictionaryLookup
+fast/layers/prevent-hit-test-during-layout.html [ Skip ]
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2016-10-31 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r208003. rdar://problem/28811878
+
+ 2016-10-27 Brent Fulgham <bfulgham@apple.com>
+
+ Prevent hit tests from being performed on an invalid render tree
+ https://bugs.webkit.org/show_bug.cgi?id=163877
+ <rdar://problem/28675761>
+
+ Reviewed by Simon Fraser.
+
+ Changeset r200971 added code to ensure that layout is up-to-date before hit testing, but did
+ so only for the main frame. It was still possible to enter cross-frame hit testing with a
+ subframe needing style recalc. In that situation, the subframe's updateLayout() would get
+ called, which could trigger a compositing change that marked the parent frame as needing style
+ recalc. A subsequent layout on the parent frame (for example by hit testing traversing into
+ a second subframe) could then mutate the parent frame's layer tree while hit testing was
+ traversing it.
+
+ This patch modifies the hit test logic to ensure that a recursive layout is performed so that
+ we always perform hit tests on a clean set of frames. It also adds some assertions to warn
+ us if we encounter this invalid state.
+
+ Tested by fast/layers/prevent-hit-test-during-layout.html.
+
+ * dom/Document.cpp:
+ (WebCore::Document::scheduleStyleRecalc): Assert that we are not hit testing
+ during style recalculation.
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::hitTestResultAtPoint): Ensure that we have a clean render tree
+ when hit testing.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setNeedsLayout): Assert that we are not in the process of hit testing
+ when we schedule a layout.
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::hitTest): Mark RenderView as in an active hit test.
+ * rendering/RenderView.h:
+
+2016-10-31 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r206635 and r206637. rdar://problem/28718754
</span><span class="cx">
</span><span class="cx"> 2016-10-28 Said Abou-Hallawa <sabouhallawa@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/dom/Document.cpp (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -1812,6 +1812,8 @@
</span><span class="cx">
</span><span class="cx"> void Document::scheduleStyleRecalc()
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_renderView || !m_renderView->inHitTesting());
+
</ins><span class="cx"> if (m_styleRecalcTimer.isActive() || inPageCache())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/EventHandler.cpp (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/EventHandler.cpp 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/Source/WebCore/page/EventHandler.cpp 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -1136,9 +1136,11 @@
</span><span class="cx">
</span><span class="cx"> unsigned nonNegativePaddingWidth = std::max<LayoutUnit>(0, padding.width()).toUnsigned();
</span><span class="cx"> unsigned nonNegativePaddingHeight = std::max<LayoutUnit>(0, padding.height()).toUnsigned();
</span><ins>+
</ins><span class="cx"> // We should always start hit testing a clean tree.
</span><del>- if (m_frame.document())
- m_frame.document()->updateLayoutIgnorePendingStylesheets();
</del><ins>+ if (auto* frameView = m_frame.view())
+ frameView->updateLayoutAndStyleIfNeededRecursive();
+
</ins><span class="cx"> HitTestResult result(point, nonNegativePaddingHeight, nonNegativePaddingWidth, nonNegativePaddingHeight, nonNegativePaddingWidth);
</span><span class="cx"> RenderView* renderView = m_frame.contentRenderer();
</span><span class="cx"> if (!renderView)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/FrameView.cpp (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/FrameView.cpp 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/Source/WebCore/page/FrameView.cpp 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -2829,8 +2829,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (RenderView* renderView = this->renderView())
</del><ins>+ if (auto* renderView = this->renderView()) {
+ ASSERT(!renderView->inHitTesting());
</ins><span class="cx"> renderView->setNeedsLayout();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::unscheduleRelayout()
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderView.cpp (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/RenderView.cpp 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderView.cpp 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #include "StyleInheritedData.h"
</span><span class="cx"> #include "TransformState.h"
</span><span class="cx"> #include <wtf/StackStats.h>
</span><ins>+#include <wtf/TemporaryChange.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -195,6 +196,10 @@
</span><span class="cx"> bool RenderView::hitTest(const HitTestRequest& request, const HitTestLocation& location, HitTestResult& result)
</span><span class="cx"> {
</span><span class="cx"> document().updateLayout();
</span><ins>+
+#if !ASSERT_DISABLED
+ TemporaryChange<bool> hitTestRestorer { m_inHitTesting, true };
+#endif
</ins><span class="cx">
</span><span class="cx"> FrameFlatteningLayoutDisallower disallower(frameView());
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderView.h (208163 => 208164)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/RenderView.h 2016-10-31 18:43:30 UTC (rev 208163)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderView.h 2016-10-31 18:43:36 UTC (rev 208164)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><del>- * Copyright (C) 2006, 2015 Apple Inc.
</del><ins>+ * Copyright (C) 2006, 2015-2016 Apple Inc.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -252,6 +252,10 @@
</span><span class="cx"> const HashSet<const RenderBox*>& boxesWithScrollSnapCoordinates() { return m_boxesWithScrollSnapCoordinates; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !ASSERT_DISABLED
+ bool inHitTesting() const { return m_inHitTesting; }
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const override;
</span><span class="cx"> const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
</span><span class="lines">@@ -369,6 +373,9 @@
</span><span class="cx"> bool m_hasSoftwareFilters;
</span><span class="cx"> bool m_usesFirstLineRules { false };
</span><span class="cx"> bool m_usesFirstLetterRules { false };
</span><ins>+#if !ASSERT_DISABLED
+ bool m_inHitTesting { false };
+#endif
</ins><span class="cx">
</span><span class="cx"> HashSet<RenderElement*> m_renderersWithPausedImageAnimation;
</span><span class="cx"> HashSet<RenderElement*> m_visibleInViewportRenderers;
</span></span></pre>
</div>
</div>
</body>
</html>