<!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>[198924] 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/198924">198924</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-31 15:43:45 -0700 (Thu, 31 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/195605">r195605</a>): ASSERTION FAILED: !NoEventDispatchAssertion::isEventDispatchForbidden()
when pressing the back button on a page with a focused subframe
https://bugs.webkit.org/show_bug.cgi?id=156033
<rdar://problem/25446561>
Reviewed by Chris Dumez.
Source/WebCore:
Fixes an assertion failure when navigating back, by pressing the browser back button, to
the previous page from a page with a focused subframe.
Following <a href="http://trac.webkit.org/projects/webkit/changeset/195605">r195605</a> (https://bugs.webkit.org/show_bug.cgi?id=153449), the responsibility for
dispatching a DOM pagehide event moved from CachedFrame to PageCache and we now instantiate
a NoEventDispatchAssertion object to enforce the invariant that no additional DOM events are
dispatched as part of adding a page to the page cache. When adding a page with a focused
subframe to the page cache we focus its main frame, which implicitly defocuses the subframe
and dispatches a DOM blur event at it. Therefore an assertion failure occurs when dispatching
this DOM blur event (because a NoEventDispatchAssertion object was allocated on the stack).
Test: fast/history/back-from-page-with-focused-iframe.html
* history/CachedFrame.cpp:
(WebCore::CachedFrame::CachedFrame): Move logic to focus the main frame from here...
* history/PageCache.cpp:
(WebCore::PageCache::addIfCacheable): to here such that any DOM blur and focus events
are dispatched before instantiate the NoEventDispatchAssertion object and enter the page
cache.
LayoutTests:
Add a test to ensure that when navigating back from a page with a focused <iframe> f, a DOM
blur event is dispatched to f, a DOM focus event is dispatched at the main frame and that
an assertion failure does not occur (only applicable in a debug build).
* fast/history/back-from-page-with-focused-iframe-expected.txt: Added.
* fast/history/back-from-page-with-focused-iframe.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="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthistorybackfrompagewithfocusediframeexpectedtxt">trunk/LayoutTests/fast/history/back-from-page-with-focused-iframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasthistorybackfrompagewithfocusediframehtml">trunk/LayoutTests/fast/history/back-from-page-with-focused-iframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198923 => 198924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-31 22:42:15 UTC (rev 198923)
+++ trunk/LayoutTests/ChangeLog 2016-03-31 22:43:45 UTC (rev 198924)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-31 Daniel Bates <dabates@apple.com>
+
+ REGRESSION (r195605): ASSERTION FAILED: !NoEventDispatchAssertion::isEventDispatchForbidden()
+ when pressing the back button on a page with a focused subframe
+ https://bugs.webkit.org/show_bug.cgi?id=156033
+ <rdar://problem/25446561>
+
+ Reviewed by Chris Dumez.
+
+ Add a test to ensure that when navigating back from a page with a focused <iframe> f, a DOM
+ blur event is dispatched to f, a DOM focus event is dispatched at the main frame and that
+ an assertion failure does not occur (only applicable in a debug build).
+
+ * fast/history/back-from-page-with-focused-iframe-expected.txt: Added.
+ * fast/history/back-from-page-with-focused-iframe.html: Added.
+
</ins><span class="cx"> 2016-03-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r191180): Safari does not send Referer Header to iframe src in certain situations
</span></span></pre></div>
<a id="trunkLayoutTestsfasthistorybackfrompagewithfocusediframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/history/back-from-page-with-focused-iframe-expected.txt (0 => 198924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/back-from-page-with-focused-iframe-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/history/back-from-page-with-focused-iframe-expected.txt 2016-03-31 22:43:45 UTC (rev 198924)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+ALERT: /iframe blurred/
+ALERT: /main frame focused/
+This test PASSED if there is no assertion failure and you see two JavaScript alerts with messages "iframe blurred" and "main frame focused" in order. Otherwise, it FAILED.
+
+============== Back Forward List ==============
+curr-> (file test):fast/history/back-from-page-with-focused-iframe.html **nav target**
+ data:text/html,<!DOCTYPE html><html><iframe srcdoc="<script> window.onfocus = function() { window.onblur = function () { alert(/iframe blurred/); }; window.top.onfocus = function () { alert(/main frame focused/); }; window.top.history.back(); }; window.focus(); </script>"></iframe></html> **nav target**
+ about:srcdoc (in frame "<!--framePath //<!--frame0-->-->")
+===============================================
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthistorybackfrompagewithfocusediframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/history/back-from-page-with-focused-iframe.html (0 => 198924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/back-from-page-with-focused-iframe.html (rev 0)
+++ trunk/LayoutTests/fast/history/back-from-page-with-focused-iframe.html 2016-03-31 22:43:45 UTC (rev 198924)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+function runTest()
+{
+ var test = [
+ '<!DOCTYPE html>',
+ '<html>',
+ '<iframe srcdoc="<script>',
+ ' window.onfocus = function() {',
+ ' window.onblur = function () { alert(/iframe blurred/); };',
+ ' window.top.onfocus = function () { alert(/main frame focused/); };',
+ ' window.top.history.back();',
+ ' };',
+ ' window.focus();',
+ ' <' + '/script>">',
+ '</iframe>',
+ '</html>',
+ ].join("");
+ window.location.href = "data:text/html," + test;
+}
+
+window.onpageshow = function (pageTransitionEvent)
+{
+ if (pageTransitionEvent.persisted) {
+ // Navigated back to this page
+ if (window.testRunner)
+ testRunner.notifyDone();
+ } else {
+ // Newly loaded
+ if (window.testRunner) {
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+ testRunner.dumpAsText();
+ testRunner.dumpBackForwardList();
+ testRunner.waitUntilDone();
+ }
+ window.setTimeout(runTest, 0); // Navigate on a zero timer to create a history entry.
+ }
+}
+</script>
+</head>
+<body>
+<p>This test PASSED if there is no assertion failure and you see two JavaScript alerts with messages &quot;iframe blurred&quot; and &quot;main frame focused&quot; in order. Otherwise, it FAILED.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198923 => 198924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-31 22:42:15 UTC (rev 198923)
+++ trunk/Source/WebCore/ChangeLog 2016-03-31 22:43:45 UTC (rev 198924)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-03-31 Daniel Bates <dabates@apple.com>
+
+ REGRESSION (r195605): ASSERTION FAILED: !NoEventDispatchAssertion::isEventDispatchForbidden()
+ when pressing the back button on a page with a focused subframe
+ https://bugs.webkit.org/show_bug.cgi?id=156033
+ <rdar://problem/25446561>
+
+ Reviewed by Chris Dumez.
+
+ Fixes an assertion failure when navigating back, by pressing the browser back button, to
+ the previous page from a page with a focused subframe.
+
+ Following r195605 (https://bugs.webkit.org/show_bug.cgi?id=153449), the responsibility for
+ dispatching a DOM pagehide event moved from CachedFrame to PageCache and we now instantiate
+ a NoEventDispatchAssertion object to enforce the invariant that no additional DOM events are
+ dispatched as part of adding a page to the page cache. When adding a page with a focused
+ subframe to the page cache we focus its main frame, which implicitly defocuses the subframe
+ and dispatches a DOM blur event at it. Therefore an assertion failure occurs when dispatching
+ this DOM blur event (because a NoEventDispatchAssertion object was allocated on the stack).
+
+ Test: fast/history/back-from-page-with-focused-iframe.html
+
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrame::CachedFrame): Move logic to focus the main frame from here...
+ * history/PageCache.cpp:
+ (WebCore::PageCache::addIfCacheable): to here such that any DOM blur and focus events
+ are dispatched before instantiate the NoEventDispatchAssertion object and enter the page
+ cache.
+
</ins><span class="cx"> 2016-03-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r191180): Safari does not send Referer Header to iframe src in certain situations
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (198923 => 198924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2016-03-31 22:42:15 UTC (rev 198923)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2016-03-31 22:43:45 UTC (rev 198924)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "FocusController.h"
</del><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -147,9 +146,6 @@
</span><span class="cx"> ASSERT(m_documentLoader);
</span><span class="cx"> ASSERT(m_view);
</span><span class="cx">
</span><del>- if (frame.page()->focusController().focusedFrame() == &frame)
- frame.page()->focusController().setFocusedFrame(&frame.mainFrame());
-
</del><span class="cx"> // Custom scrollbar renderers will get reattached when the document comes out of the page cache
</span><span class="cx"> m_view->detachCustomScrollbars();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (198923 => 198924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2016-03-31 22:42:15 UTC (rev 198923)
+++ trunk/Source/WebCore/history/PageCache.cpp 2016-03-31 22:43:45 UTC (rev 198924)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "DiagnosticLoggingKeys.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><ins>+#include "FocusController.h"
</ins><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -392,6 +393,11 @@
</span><span class="cx"> // Make sure all the documents know they are being added to the PageCache.
</span><span class="cx"> setInPageCache(*page, true);
</span><span class="cx">
</span><ins>+ // Focus the main frame, defocusing a focused subframe (if we have one). We do this here,
+ // before the page enters the page cache, while we still can dispatch DOM blur/focus events.
+ if (page->focusController().focusedFrame())
+ page->focusController().setFocusedFrame(&page->mainFrame());
+
</ins><span class="cx"> // Fire the pagehide event in all frames.
</span><span class="cx"> firePageHideEventRecursively(page->mainFrame());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>