<!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>[168843] 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/168843">168843</a></dd>
<dt>Author</dt> <dd>jhoneycutt@apple.com</dd>
<dt>Date</dt> <dd>2014-05-14 10:24:47 -0700 (Wed, 14 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert "Don't dispatch 'beforeload' event inside FrameView::layout()",
commit 84fe8cf6fbe8b5de9a06300ca3ef6d0ffc96948c, and associated
follow-up fixes:
"platform/mac/plugins/testplugin-onnew-onpaint.html failing after
<a href="http://trac.webkit.org/projects/webkit/changeset/168668">r168668</a>", commit c17be3bf5127baf94310af4b4b9bf5a57d29aaf4
"[Win] Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/168668">r168668</a>.", commit
4fa470ad12c38ee7d4c114541b6dd321181a8bc9
The original merged patch appears to have caused a regression in
fast/dom/HTMLObjectElement/object-as-frame.html.
<https://bugs.webkit.org/show_bug.cgi?id=132886>
Reviewed by Alexey Proskuryakov.
Source/WebCore:
* WebCore.exp.in:
* dom/Document.cpp:
(WebCore::Document::updateLayoutIgnorePendingStylesheets):
* dom/Document.h:
* html/HTMLAppletElement.cpp:
(WebCore::HTMLAppletElement::renderWidgetForJSBindings):
* html/HTMLEmbedElement.cpp:
(WebCore::HTMLEmbedElement::renderWidgetForJSBindings):
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::renderWidgetForJSBindings):
* page/FrameView.cpp:
(WebCore::FrameView::FrameView):
(WebCore::FrameView::reset):
(WebCore::FrameView::flushAnyPendingPostLayoutTasks):
(WebCore::FrameView::performPostLayoutTasks):
(WebCore::FrameView::updateEmbeddedObjectsTimerFired): Deleted.
* page/FrameView.h:
* testing/Internals.cpp:
(WebCore::Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks): Deleted.
* testing/Internals.h:
* testing/Internals.idl:
Source/WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
LayoutTests:
* compositing/plugins/composited-plugin.html:
* compositing/plugins/no-backing-store.html:
* fast/dom/beforeload/flash-before-load.html:
* fast/events/beforeload-assertion-expected.txt: Removed.
* fast/events/beforeload-assertion.html: Removed.
* fast/events/beforeload-iframe-crash-expected.txt: Removed.
* fast/events/beforeload-iframe-crash.html: Removed.
* fast/events/beforeload-input-time-crash-expected.txt: Removed.
* fast/events/beforeload-input-time-crash.html: Removed.
* http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html:
* http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html:
* http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html:
* http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html:
* http/tests/security/contentSecurityPolicy/object-src-none-allowed.html:
* http/tests/security/contentSecurityPolicy/object-src-none-blocked.html:
* http/tests/security/contentSecurityPolicy/resources/multiple-iframe-plugin-test.js:
(testImpl.iframe.onload):
(testImpl):
* http/tests/security/mixedContent/insecure-plugin-in-iframe.html:
* platform/mac/plugins/supports-carbon-event-model.html:
* platform/mac/plugins/testplugin-onnew-onpaint.html:
* plugins/get-user-agent-with-null-npp-from-npp-new.html:
* plugins/mouse-click-plugin-clears-selection.html:
* plugins/netscape-plugin-map-data-to-src.html:
* plugins/no-mime-with-valid-extension.html:
* plugins/plugin-initiate-popup-window.html:
* plugins/windowless_plugin_paint_test.html:
* resources/plugin.js: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscompositingpluginscompositedpluginhtml">trunk/LayoutTests/compositing/plugins/composited-plugin.html</a></li>
<li><a href="#trunkLayoutTestscompositingpluginsnobackingstorehtml">trunk/LayoutTests/compositing/plugins/no-backing-store.html</a></li>
<li><a href="#trunkLayoutTestsfastdombeforeloadflashbeforeloadhtml">trunk/LayoutTests/fast/dom/beforeload/flash-before-load.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicy11plugintypesnotypedatahtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicy11plugintypesnourlblockedhtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyobjectsrcnourlallowedhtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyobjectsrcnourlblockedhtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyobjectsrcnoneallowedhtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-allowed.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyobjectsrcnoneblockedhtml">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-blocked.html</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycontentSecurityPolicyresourcesmultipleiframeplugintestjs">trunk/LayoutTests/http/tests/security/contentSecurityPolicy/resources/multiple-iframe-plugin-test.js</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritymixedContentinsecureplugininiframehtml">trunk/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacpluginssupportscarboneventmodelhtml">trunk/LayoutTests/platform/mac/plugins/supports-carbon-event-model.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacpluginstestpluginonnewonpainthtml">trunk/LayoutTests/platform/mac/plugins/testplugin-onnew-onpaint.html</a></li>
<li><a href="#trunkLayoutTestspluginsgetuseragentwithnullnppfromnppnewhtml">trunk/LayoutTests/plugins/get-user-agent-with-null-npp-from-npp-new.html</a></li>
<li><a href="#trunkLayoutTestspluginsmouseclickpluginclearsselectionhtml">trunk/LayoutTests/plugins/mouse-click-plugin-clears-selection.html</a></li>
<li><a href="#trunkLayoutTestspluginsnetscapepluginmapdatatosrchtml">trunk/LayoutTests/plugins/netscape-plugin-map-data-to-src.html</a></li>
<li><a href="#trunkLayoutTestspluginsnomimewithvalidextensionhtml">trunk/LayoutTests/plugins/no-mime-with-valid-extension.html</a></li>
<li><a href="#trunkLayoutTestspluginsplugininitiatepopupwindowhtml">trunk/LayoutTests/plugins/plugin-initiate-popup-window.html</a></li>
<li><a href="#trunkLayoutTestspluginswindowless_plugin_paint_testhtml">trunk/LayoutTests/plugins/windowless_plugin_paint_test.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAppletElementcpp">trunk/Source/WebCore/html/HTMLAppletElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLEmbedElementcpp">trunk/Source/WebCore/html/HTMLEmbedElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementcpp">trunk/Source/WebCore/html/HTMLObjectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventsbeforeloadassertionexpectedtxt">trunk/LayoutTests/fast/events/beforeload-assertion-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeloadassertionhtml">trunk/LayoutTests/fast/events/beforeload-assertion.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeloadiframecrashexpectedtxt">trunk/LayoutTests/fast/events/beforeload-iframe-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeloadiframecrashhtml">trunk/LayoutTests/fast/events/beforeload-iframe-crash.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeloadinputtimecrashexpectedtxt">trunk/LayoutTests/fast/events/beforeload-input-time-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsbeforeloadinputtimecrashhtml">trunk/LayoutTests/fast/events/beforeload-input-time-crash.html</a></li>
<li><a href="#trunkLayoutTestsresourcespluginjs">trunk/LayoutTests/resources/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/ChangeLog 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2014-05-13 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Revert "Don't dispatch 'beforeload' event inside FrameView::layout()",
+ commit 84fe8cf6fbe8b5de9a06300ca3ef6d0ffc96948c, and associated
+ follow-up fixes:
+
+ "platform/mac/plugins/testplugin-onnew-onpaint.html failing after
+ r168668", commit c17be3bf5127baf94310af4b4b9bf5a57d29aaf4
+ "[Win] Unreviewed build fix after r168668.", commit
+ 4fa470ad12c38ee7d4c114541b6dd321181a8bc9
+
+ The original merged patch appears to have caused a regression in
+ fast/dom/HTMLObjectElement/object-as-frame.html.
+
+ <https://bugs.webkit.org/show_bug.cgi?id=132886>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * compositing/plugins/composited-plugin.html:
+ * compositing/plugins/no-backing-store.html:
+ * fast/dom/beforeload/flash-before-load.html:
+ * fast/events/beforeload-assertion-expected.txt: Removed.
+ * fast/events/beforeload-assertion.html: Removed.
+ * fast/events/beforeload-iframe-crash-expected.txt: Removed.
+ * fast/events/beforeload-iframe-crash.html: Removed.
+ * fast/events/beforeload-input-time-crash-expected.txt: Removed.
+ * fast/events/beforeload-input-time-crash.html: Removed.
+ * http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html:
+ * http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html:
+ * http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html:
+ * http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html:
+ * http/tests/security/contentSecurityPolicy/object-src-none-allowed.html:
+ * http/tests/security/contentSecurityPolicy/object-src-none-blocked.html:
+ * http/tests/security/contentSecurityPolicy/resources/multiple-iframe-plugin-test.js:
+ (testImpl.iframe.onload):
+ (testImpl):
+ * http/tests/security/mixedContent/insecure-plugin-in-iframe.html:
+ * platform/mac/plugins/supports-carbon-event-model.html:
+ * platform/mac/plugins/testplugin-onnew-onpaint.html:
+ * plugins/get-user-agent-with-null-npp-from-npp-new.html:
+ * plugins/mouse-click-plugin-clears-selection.html:
+ * plugins/netscape-plugin-map-data-to-src.html:
+ * plugins/no-mime-with-valid-extension.html:
+ * plugins/plugin-initiate-popup-window.html:
+ * plugins/windowless_plugin_paint_test.html:
+ * resources/plugin.js: Removed.
+
</ins><span class="cx"> 2014-05-14 Kiran <kiran.guduru@samsung.com>
</span><span class="cx">
</span><span class="cx"> alidation for getUserMedia() errorCallback is missing.
</span></span></pre></div>
<a id="trunkLayoutTestscompositingpluginscompositedpluginhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/plugins/composited-plugin.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/plugins/composited-plugin.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/compositing/plugins/composited-plugin.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,8 +1,6 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <body>
</span><del>- <script src="../../resources/plugin.js"></script>
- <script>runAfterPluginLoad(null, NotifyDone);</script>
</del><span class="cx"> <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestscompositingpluginsnobackingstorehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/plugins/no-backing-store.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/plugins/no-backing-store.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/compositing/plugins/no-backing-store.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -6,13 +6,12 @@
</span><span class="cx"> margin: 10px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><del>- <script src="../../resources/plugin.js"></script>
</del><span class="cx"> <script type="text/javascript" charset="utf-8">
</span><del>- if (window.testRunner)
</del><ins>+ if (window.testRunner) {
</ins><span class="cx"> testRunner.dumpAsText();
</span><ins>+ testRunner.waitUntilDone();
+ }
</ins><span class="cx">
</span><del>- runAfterPluginLoad(doTest, DoNotNotifyDone);
-
</del><span class="cx"> function doTest()
</span><span class="cx"> {
</span><span class="cx"> // Need to wait for compositing layers to be updated. FIXME remove.
</span><span class="lines">@@ -23,6 +22,7 @@
</span><span class="cx"> }
</span><span class="cx"> }, 0)
</span><span class="cx"> }
</span><ins>+ window.addEventListener('load', doTest, false);
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastdombeforeloadflashbeforeloadhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/beforeload/flash-before-load.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/beforeload/flash-before-load.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/fast/dom/beforeload/flash-before-load.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -4,12 +4,9 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <div id="console"></div>
</span><del>-<script src="../../../resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><del>- if (window.testRunner)
- testRunner.dumpAsText();
-
- runAfterPluginLoad(null, NotifyDone);
</del><ins>+if (window.testRunner)
+ testRunner.dumpAsText();
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <object id="plugin" onbeforeload="return false" type="application/x-shockwave-flash" data="../../../plugins/resources/simple_blank.swf"
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeloadassertionexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/beforeload-assertion-expected.txt (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/beforeload-assertion-expected.txt 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/fast/events/beforeload-assertion-expected.txt 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-
-PASS if no assertion failure.
</del></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeloadassertionhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/beforeload-assertion.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/beforeload-assertion.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/fast/events/beforeload-assertion.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<div id="d1"></div>
-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-document.addEventListener('beforeload', function(event) {
- d1.appendChild(document.createElement('button'));
- d1.offsetLeft;
- d1.remove();
-}, true);
-</script>
-<embed src="data:image/png,"></embed>
-<p>PASS if no assertion failure.</p>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeloadiframecrashexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/beforeload-iframe-crash-expected.txt (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/beforeload-iframe-crash-expected.txt 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/fast/events/beforeload-iframe-crash-expected.txt 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-PASS if not crashed.
</del></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeloadiframecrashhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/beforeload-iframe-crash.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/beforeload-iframe-crash.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/fast/events/beforeload-iframe-crash.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-<iframe></iframe><object onbeforeload="crash()">
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-function crash() {
- document.getElementsByTagName("iframe")[0].contentWindow.scrollX;
- document.open();
-}
-
-document.body.offsetLeft;
-setTimeout(function() {
- document.close();
- document.body.innerHTML = 'PASS if not crashed.';
- testRunner.notifyDone();
-}, 1);
-</script>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeloadinputtimecrashexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/beforeload-input-time-crash-expected.txt (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/beforeload-input-time-crash-expected.txt 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/fast/events/beforeload-input-time-crash-expected.txt 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-PASS if not crashed.
</del></span></pre></div>
<a id="trunkLayoutTestsfasteventsbeforeloadinputtimecrashhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/beforeload-input-time-crash.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/beforeload-input-time-crash.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/fast/events/beforeload-input-time-crash.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-<input id="t1" type="time">
-<script>
-var time1 = document.getElementById('t1');
-document.addEventListener('beforeload', function(event) {
- time1.value = time1.value ? '' : '23:59';
-}, true);
-
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-setTimeout(function() {
- document.body.innerHTML = 'PASS if not crashed.';
- testRunner.notifyDone();
-}, 100);
-time1.focus();
-</script>
-<embed src="data:text/html,PASS"></embed>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicy11plugintypesnotypedatahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,14 +1,11 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="/js-test-resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><del>- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpChildFramesAsText();
- }
-
- runAfterPluginLoad(null, NotifyDone);
</del><ins>+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+}
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="/plugins/resources/mock-plugin-logger.js"></script>
</span><span class="cx"> <meta http-equiv="X-WebKit-CSP" content="plugin-types application/x-invalid-type">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicy11plugintypesnourlblockedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,12 +1,9 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="/js-test-resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><del>- if (window.testRunner)
- testRunner.dumpAsText();
-
- runAfterPluginLoad(null, NotifyDone);
</del><ins>+if (window.testRunner)
+ testRunner.dumpAsText();
</ins><span class="cx"> </script>
</span><span class="cx"> <meta http-equiv="X-WebKit-CSP" content="plugin-types text/plain">
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyobjectsrcnourlallowedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,12 +1,9 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="/js-test-resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><del>- if (window.testRunner)
- testRunner.dumpAsText();
-
- runAfterPluginLoad(null, NotifyDone);
</del><ins>+if (window.testRunner)
+ testRunner.dumpAsText();
</ins><span class="cx"> </script>
</span><span class="cx"> <meta http-equiv="Content-Security-Policy" content="object-src 'self'">
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyobjectsrcnourlblockedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,12 +1,9 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="/js-test-resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><del>- if (window.testRunner)
- testRunner.dumpAsText();
-
- runAfterPluginLoad(null, NotifyDone);
</del><ins>+if (window.testRunner)
+ testRunner.dumpAsText();
</ins><span class="cx"> </script>
</span><span class="cx"> <meta http-equiv="Content-Security-Policy" content="object-src 'none'">
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyobjectsrcnoneallowedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-allowed.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-allowed.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-allowed.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,17 +1,14 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="/js-test-resources/plugin.js"></script>
</del><ins>+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+}
+</script>
</ins><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-object-data.pl?plugin=data:application/x-webkit-test-netscape,logifloaded&log=PASS!&csp=img-src%20'none'"></iframe>
</span><span class="cx"> </body>
</span><del>-<script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpChildFramesAsText();
- }
-
- runAfterPluginLoad(null, NotifyDone, document.getElementsByTagName("iframe")[0]);
-</script>
</del><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyobjectsrcnoneblockedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-blocked.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-blocked.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-blocked.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,17 +1,14 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="/js-test-resources/plugin.js"></script>
</del><ins>+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+}
+</script>
</ins><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-object-data.pl?plugin=data:application/x-webkit-test-netscape,logifloaded&log=FAIL&csp=object-src%20'none'"></iframe>
</span><span class="cx"> </body>
</span><del>-<script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpChildFramesAsText();
- }
-
- runAfterPluginLoad(null, NotifyDone, document.getElementsByTagName("iframe")[0]);
-</script>
</del><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycontentSecurityPolicyresourcesmultipleiframeplugintestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/resources/multiple-iframe-plugin-test.js (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/resources/multiple-iframe-plugin-test.js 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/resources/multiple-iframe-plugin-test.js 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -38,11 +38,7 @@
</span><span class="cx"> else
</span><span class="cx"> iframe.src += "&type=application/x-webkit-test-netscape";
</span><span class="cx">
</span><del>- iframe.onload = function() {
- if (window.internals)
- internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(iframe);
- testImpl(experimental);
- };
</del><ins>+ iframe.onload = function() { testImpl(experimental); };
</ins><span class="cx"> document.body.appendChild(iframe);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritymixedContentinsecureplugininiframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -3,11 +3,6 @@
</span><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><del>-
-onload = function() {
- if (window.internals)
- internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(document.querySelector('iframe'));
-};
</del><span class="cx"> </script>
</span><span class="cx"> <p>This test loads a secure iframe that loads an insecure plugin. We should
</span><span class="cx"> get a mixed content callback because the insecure plug-in can script the secure
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacpluginssupportscarboneventmodelhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/plugins/supports-carbon-event-model.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/plugins/supports-carbon-event-model.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/platform/mac/plugins/supports-carbon-event-model.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,9 +1,6 @@
</span><del>-<script src="../../../resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><del>- if (window.testRunner)
- testRunner.dumpAsText();
-
- runAfterPluginLoad(null, NotifyDone);
</del><ins>+if (window.testRunner)
+ testRunner.dumpAsText();
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <embed id="testPlugin"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacpluginstestpluginonnewonpainthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/plugins/testplugin-onnew-onpaint.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/plugins/testplugin-onnew-onpaint.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/platform/mac/plugins/testplugin-onnew-onpaint.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx">
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>- <script src="../../../resources/plugin.js"></script>
</del><span class="cx"> <script type="text/javascript" charset="utf-8">
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="lines">@@ -26,8 +25,6 @@
</span><span class="cx"> didPaint = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- runAfterPluginLoad(null, NotifyDone);
</del><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestspluginsgetuseragentwithnullnppfromnppnewhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/get-user-agent-with-null-npp-from-npp-new.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/get-user-agent-with-null-npp-from-npp-new.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/plugins/get-user-agent-with-null-npp-from-npp-new.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,11 +1,9 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>- <script src="../resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><del>- runAfterPluginLoad(null, NotifyDone);
</del><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestspluginsmouseclickpluginclearsselectionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/mouse-click-plugin-clears-selection.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/mouse-click-plugin-clears-selection.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/plugins/mouse-click-plugin-clears-selection.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,9 +1,8 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="../resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><span class="cx">
</span><del>-runAfterPluginLoad(function() {
</del><ins>+function runTest() {
</ins><span class="cx"> inputElement = document.getElementById('frame');
</span><span class="cx"> inputElement.focus();
</span><span class="cx"> inputElement.select();
</span><span class="lines">@@ -15,10 +14,10 @@
</span><span class="cx"> eventSender.mouseDown();
</span><span class="cx"> eventSender.mouseUp();
</span><span class="cx"> }
</span><del>-}, NotifyDone);
</del><ins>+}
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><del>-<body>
</del><ins>+<body onload="runTest();">
</ins><span class="cx"> <embed id="plg" type="application/x-webkit-test-netscape" width="100" height="100" windowedplugin="false"></embed><br>
</span><span class="cx"> <input id="frame" value="hello"/>
</span><span class="cx"> <div id="output"></div>
</span></span></pre></div>
<a id="trunkLayoutTestspluginsnetscapepluginmapdatatosrchtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/netscape-plugin-map-data-to-src.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/netscape-plugin-map-data-to-src.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/plugins/netscape-plugin-map-data-to-src.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,10 +1,8 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><del>-<script src="../resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><del>- runAfterPluginLoad(null, NotifyDone);
</del><span class="cx"> </script>
</span><span class="cx"> <body style="margin:0px;overflow:hidden">
</span><span class="cx"> <object name="testPlugin" type="application/x-webkit-test-netscape" logSrc="true" data="blah">
</span></span></pre></div>
<a id="trunkLayoutTestspluginsnomimewithvalidextensionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/no-mime-with-valid-extension.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/no-mime-with-valid-extension.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/plugins/no-mime-with-valid-extension.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-<script src="../resources/plugin.js"></script>
</del><span class="cx"> <script>
</span><del>- if (window.testRunner)
</del><ins>+ if (window.testRunner) {
</ins><span class="cx"> testRunner.dumpAsText();
</span><del>- runAfterPluginLoad(null, NotifyDone);
</del><ins>+ testRunner.waitUntilDone();
+ }
</ins><span class="cx"> </script>
</span><span class="cx"> <p>
</span><span class="cx"> This test checks that <a href="https://bugs.webkit.org/show_bug.cgi?id=50657">bug 50568</a>
</span><span class="lines">@@ -12,4 +12,8 @@
</span><span class="cx"> attribute.
</span><span class="cx"> </p>
</span><span class="cx"> <!-- Embed tag with missing type="" parameter -->
</span><del>-<embed id="plugin" name="plugin" src="resources/test.testnetscape" logSrc="1">
</del><span class="cx">\ No newline at end of file
</span><ins>+<embed id="plugin" name="plugin" src="resources/test.testnetscape" logSrc="1">
+<script>
+ if (window.testRunner)
+ testRunner.notifyDone();
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestspluginsplugininitiatepopupwindowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/plugin-initiate-popup-window.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/plugin-initiate-popup-window.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/plugins/plugin-initiate-popup-window.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><del>-<body onload="internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(); test();">
</del><ins>+<body onload="window.setTimeout(test, 0);">
</ins><span class="cx"> <embed type="application/x-webkit-test-netscape" width=100 height=40 evaluatescript="mouse::popup_by_mousedown()" windowedplugin="false"></embed><br>
</span><span class="cx"> <embed type="application/x-webkit-test-netscape" width=100 height=40 evaluatescript="key::popup_by_keydown()" windowedplugin="false"></embed><br>
</span><span class="cx"> Specify a script and a mouse/keyboard event to the plugin. The specified script will be evaluated in the browser when the specified event is received by the plugin. The test is for bug https://bugs.webkit.org/show_bug.cgi?id=41292.<br>
</span></span></pre></div>
<a id="trunkLayoutTestspluginswindowless_plugin_paint_testhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/windowless_plugin_paint_test.html (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/windowless_plugin_paint_test.html 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/plugins/windowless_plugin_paint_test.html 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -14,8 +14,6 @@
</span><span class="cx"> var pluginDiv = document.getElementById("pluginDiv");
</span><span class="cx"> // Create the plugin in the middle of the page.
</span><span class="cx"> pluginDiv.innerHTML = "<embed id=\"testPlugin\" type=\"application/x-webkit-test-netscape\" width=\"200\" height=\"200\" onpaintevent=\"didPaint()\" windowedPlugin=\"false\"></embed>";
</span><del>- if (window.internals)
- internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
</del><span class="cx"> testRunner.displayInvalidatedRegion();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsresourcespluginjs"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/resources/plugin.js (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/resources/plugin.js 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/LayoutTests/resources/plugin.js 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,21 +0,0 @@
</span><del>-// Wait for the load event, run post layout tasks, run the specified function,
-// and notify the test runner that the test is done.
-
-var NotifyDone = true;
-var DoNotNotifyDone = false;
-
-function runAfterPluginLoad(func, notifyDone, node) {
- if (window.testRunner)
- testRunner.waitUntilDone();
-
- window.addEventListener('load', function() {
- if (window.internals)
- internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(node);
-
- if (func)
- func();
-
- if (notifyDone && window.testRunner)
- testRunner.notifyDone();
- }, false);
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/ChangeLog 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2014-05-13 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Revert "Don't dispatch 'beforeload' event inside FrameView::layout()",
+ commit 84fe8cf6fbe8b5de9a06300ca3ef6d0ffc96948c, and associated
+ follow-up fixes:
+
+ "platform/mac/plugins/testplugin-onnew-onpaint.html failing after
+ r168668", commit c17be3bf5127baf94310af4b4b9bf5a57d29aaf4
+ "[Win] Unreviewed build fix after r168668.", commit
+ 4fa470ad12c38ee7d4c114541b6dd321181a8bc9
+
+ The original merged patch appears to have caused a regression in
+ fast/dom/HTMLObjectElement/object-as-frame.html.
+
+ <https://bugs.webkit.org/show_bug.cgi?id=132886>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebCore.exp.in:
+ * dom/Document.cpp:
+ (WebCore::Document::updateLayoutIgnorePendingStylesheets):
+ * dom/Document.h:
+ * html/HTMLAppletElement.cpp:
+ (WebCore::HTMLAppletElement::renderWidgetForJSBindings):
+ * html/HTMLEmbedElement.cpp:
+ (WebCore::HTMLEmbedElement::renderWidgetForJSBindings):
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::renderWidgetForJSBindings):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::FrameView):
+ (WebCore::FrameView::reset):
+ (WebCore::FrameView::flushAnyPendingPostLayoutTasks):
+ (WebCore::FrameView::performPostLayoutTasks):
+ (WebCore::FrameView::updateEmbeddedObjectsTimerFired): Deleted.
+ * page/FrameView.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks): Deleted.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2014-05-14 Kiran <kiran.guduru@samsung.com>
</span><span class="cx">
</span><span class="cx"> alidation for getUserMedia() errorCallback is missing.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1256,7 +1256,7 @@
</span><span class="cx"> __ZN7WebCore8Document26didRemoveWheelEventHandlerEv
</span><span class="cx"> __ZN7WebCore8Document26pageSizeAndMarginsInPixelsEiRNS_7IntSizeERiS3_S3_S3_
</span><span class="cx"> __ZN7WebCore8Document27removeMediaCanStartListenerEPNS_21MediaCanStartListenerE
</span><del>-__ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsENS0_18RunPostLayoutTasksE
</del><ins>+__ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsEv
</ins><span class="cx"> __ZN7WebCore8Document4headEv
</span><span class="cx"> __ZN7WebCore8Document8iconURLsEi
</span><span class="cx"> __ZN7WebCore8FormData6createEPKvm
</span><span class="lines">@@ -1774,7 +1774,6 @@
</span><span class="cx"> __ZNK7WebCore21BackForwardController12forwardCountEv
</span><span class="cx"> __ZNK7WebCore21BackForwardController18canGoBackOrForwardEi
</span><span class="cx"> __ZNK7WebCore21BackForwardController9backCountEv
</span><del>-__ZNK7WebCore21HTMLFrameOwnerElement15contentDocumentEv
</del><span class="cx"> __ZNK7WebCore21NetworkStorageSession13cookieStorageEv
</span><span class="cx"> __ZNK7WebCore21RenderLayerCompositor11scrollLayerEv
</span><span class="cx"> __ZNK7WebCore21RenderLayerCompositor15rootRenderLayerEv
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1831,10 +1831,10 @@
</span><span class="cx"> // stylesheets are loaded. Doing a layout ignoring the pending stylesheets
</span><span class="cx"> // lets us get reasonable answers. The long term solution to this problem is
</span><span class="cx"> // to instead suspend JavaScript execution.
</span><del>-void Document::updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasks runPostLayoutTasks)
</del><ins>+void Document::updateLayoutIgnorePendingStylesheets()
</ins><span class="cx"> {
</span><span class="cx"> bool oldIgnore = m_ignorePendingStylesheets;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!haveStylesheetsLoaded()) {
</span><span class="cx"> m_ignorePendingStylesheets = true;
</span><span class="cx"> // FIXME: We are willing to attempt to suppress painting with outdated style info only once. Our assumption is that it would be
</span><span class="lines">@@ -1856,9 +1856,6 @@
</span><span class="cx">
</span><span class="cx"> updateLayout();
</span><span class="cx">
</span><del>- if (runPostLayoutTasks == RunPostLayoutTasksSynchronously && view())
- view()->flushAnyPendingPostLayoutTasks();
-
</del><span class="cx"> m_ignorePendingStylesheets = oldIgnore;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/dom/Document.h 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -587,11 +587,7 @@
</span><span class="cx"> void updateStyleIfNeeded();
</span><span class="cx"> bool updateStyleIfNeededForNode(const Node&);
</span><span class="cx"> void updateLayout();
</span><del>- enum RunPostLayoutTasks {
- RunPostLayoutTasksAsyhnchronously,
- RunPostLayoutTasksSynchronously,
- };
- void updateLayoutIgnorePendingStylesheets(RunPostLayoutTasks = RunPostLayoutTasksAsyhnchronously);
</del><ins>+ void updateLayoutIgnorePendingStylesheets();
</ins><span class="cx"> PassRef<RenderStyle> styleForElementIgnoringPendingStylesheets(Element*);
</span><span class="cx">
</span><span class="cx"> // Returns true if page box (margin boxes and page borders) is visible.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAppletElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAppletElement.cpp (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAppletElement.cpp 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/html/HTMLAppletElement.cpp 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -88,10 +88,7 @@
</span><span class="cx"> if (!canEmbedJava())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- // Needs to load the plugin immediatedly because this function is called
- // when JavaScript code accesses the plugin.
- // FIXME: <rdar://16893708> Check if dispatching events here is safe.
- document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
</del><ins>+ document().updateLayoutIgnorePendingStylesheets();
</ins><span class="cx"> return renderWidget();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLEmbedElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLEmbedElement.cpp (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLEmbedElement.cpp 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/html/HTMLEmbedElement.cpp 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -71,12 +71,8 @@
</span><span class="cx"> RenderWidget* HTMLEmbedElement::renderWidgetForJSBindings() const
</span><span class="cx"> {
</span><span class="cx"> FrameView* view = document().view();
</span><del>- if (!view || (!view->isInLayout() && !view->isPainting())) {
- // Needs to load the plugin immediatedly because this function is called
- // when JavaScript code accesses the plugin.
- // FIXME: <rdar://16893708> Check if dispatching events here is safe.
- document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
- }
</del><ins>+ if (!view || (!view->isInLayout() && !view->isPainting()))
+ document().updateLayoutIgnorePendingStylesheets();
</ins><span class="cx"> return findWidgetRenderer(this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -83,10 +83,7 @@
</span><span class="cx">
</span><span class="cx"> RenderWidget* HTMLObjectElement::renderWidgetForJSBindings() const
</span><span class="cx"> {
</span><del>- // Needs to load the plugin immediatedly because this function is called
- // when JavaScript code accesses the plugin.
- // FIXME: <rdar://16893708> Check if dispatching events here is safe.
- document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
</del><ins>+ document().updateLayoutIgnorePendingStylesheets();
</ins><span class="cx"> return renderWidget(); // This will return 0 if the renderer is not a RenderWidget.
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -160,7 +160,6 @@
</span><span class="cx"> , m_layoutPhase(OutsideLayout)
</span><span class="cx"> , m_inSynchronousPostLayout(false)
</span><span class="cx"> , m_postLayoutTasksTimer(this, &FrameView::postLayoutTimerFired)
</span><del>- , m_updateEmbeddedObjectsTimer(this, &FrameView::updateEmbeddedObjectsTimerFired)
</del><span class="cx"> , m_isTransparent(false)
</span><span class="cx"> , m_baseBackgroundColor(Color::white)
</span><span class="cx"> , m_mediaType("screen")
</span><span class="lines">@@ -251,7 +250,6 @@
</span><span class="cx"> m_layoutCount = 0;
</span><span class="cx"> m_nestedLayoutCount = 0;
</span><span class="cx"> m_postLayoutTasksTimer.stop();
</span><del>- m_updateEmbeddedObjectsTimer.stop();
</del><span class="cx"> m_firstLayout = true;
</span><span class="cx"> m_firstLayoutCallbackPending = false;
</span><span class="cx"> m_wasScrolledByUser = false;
</span><span class="lines">@@ -2744,28 +2742,16 @@
</span><span class="cx"> return m_embeddedObjectsToUpdate->isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::updateEmbeddedObjectsTimerFired(Timer<FrameView>*)
-{
- RefPtr<FrameView> protect(this);
- m_updateEmbeddedObjectsTimer.stop();
- for (unsigned i = 0; i < maxUpdateEmbeddedObjectsIterations; i++) {
- if (updateEmbeddedObjects())
- break;
- }
-}
-
</del><span class="cx"> void FrameView::flushAnyPendingPostLayoutTasks()
</span><span class="cx"> {
</span><del>- if (m_postLayoutTasksTimer.isActive())
- performPostLayoutTasks();
- if (m_updateEmbeddedObjectsTimer.isActive())
- updateEmbeddedObjectsTimerFired(nullptr);
</del><ins>+ if (!m_postLayoutTasksTimer.isActive())
+ return;
+
+ performPostLayoutTasks();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::performPostLayoutTasks()
</span><span class="cx"> {
</span><del>- // FIXME: We should not run any JavaScript code in this function.
-
</del><span class="cx"> m_postLayoutTasksTimer.stop();
</span><span class="cx">
</span><span class="cx"> frame().selection().layoutDidChange();
</span><span class="lines">@@ -2796,7 +2782,10 @@
</span><span class="cx"> // is called through the post layout timer.
</span><span class="cx"> Ref<FrameView> protect(*this);
</span><span class="cx">
</span><del>- m_updateEmbeddedObjectsTimer.startOneShot(0);
</del><ins>+ for (unsigned i = 0; i < maxUpdateEmbeddedObjectsIterations; i++) {
+ if (updateEmbeddedObjects())
+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> if (auto* page = frame().page()) {
</span><span class="cx"> if (auto* scrollingCoordinator = page->scrollingCoordinator())
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/page/FrameView.h 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -591,7 +591,6 @@
</span><span class="cx"> void enableSpeculativeTilingIfNeeded();
</span><span class="cx"> void speculativeTilingEnableTimerFired(Timer<FrameView>&);
</span><span class="cx">
</span><del>- void updateEmbeddedObjectsTimerFired(Timer<FrameView>*);
</del><span class="cx"> bool updateEmbeddedObjects();
</span><span class="cx"> void updateEmbeddedObject(RenderEmbeddedObject&);
</span><span class="cx"> void scrollToAnchor();
</span><span class="lines">@@ -646,7 +645,6 @@
</span><span class="cx"> int m_layoutCount;
</span><span class="cx"> unsigned m_nestedLayoutCount;
</span><span class="cx"> Timer<FrameView> m_postLayoutTasksTimer;
</span><del>- Timer<FrameView> m_updateEmbeddedObjectsTimer;
</del><span class="cx"> bool m_firstLayoutCallbackPending;
</span><span class="cx">
</span><span class="cx"> bool m_firstLayout;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> #include "FormController.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameView.h"
</span><del>-#include "HTMLIFrameElement.h"
</del><span class="cx"> #include "HTMLInputElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLPlugInElement.h"
</span><span class="lines">@@ -1896,28 +1895,6 @@
</span><span class="cx"> frameView->setTracksRepaints(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(ExceptionCode& ec)
-{
- updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(nullptr, ec);
-}
-
-void Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node* node, ExceptionCode& ec)
-{
- Document* document;
- if (!node)
- document = contextDocument();
- else if (node->isDocumentNode())
- document = toDocument(node);
- else if (node->hasTagName(HTMLNames::iframeTag))
- document = toHTMLIFrameElement(node)->contentDocument();
- else {
- ec = TypeError;
- return;
- }
-
- document->updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);
-}
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> static const char* cursorTypeToString(Cursor::Type cursorType)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/testing/Internals.h 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -270,8 +270,6 @@
</span><span class="cx">
</span><span class="cx"> void startTrackingRepaints(ExceptionCode&);
</span><span class="cx"> void stopTrackingRepaints(ExceptionCode&);
</span><del>- void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(ExceptionCode&);
- void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node*, ExceptionCode&);
</del><span class="cx">
</span><span class="cx"> PassRefPtr<ArrayBuffer> serializeObject(PassRefPtr<SerializedScriptValue>) const;
</span><span class="cx"> PassRefPtr<SerializedScriptValue> deserializeBuffer(PassRefPtr<ArrayBuffer>) const;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebCore/testing/Internals.idl 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -231,11 +231,6 @@
</span><span class="cx"> [RaisesException] void startTrackingRepaints();
</span><span class="cx"> [RaisesException] void stopTrackingRepaints();
</span><span class="cx">
</span><del>- // |node| should be Document, HTMLIFrameElement, or unspecified.
- // If |node| is an HTMLIFrameElement, it assumes node.contentDocument is
- // specified without security checks. Unspecified means this document.
- [RaisesException] void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(optional Node node);
-
</del><span class="cx"> // Returns a string with information about the mouse cursor used at the specified client location.
</span><span class="cx"> [RaisesException] DOMString getCurrentCursorInfo();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebKit/ChangeLog 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-13 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Revert "Don't dispatch 'beforeload' event inside FrameView::layout()",
+ commit 84fe8cf6fbe8b5de9a06300ca3ef6d0ffc96948c, and associated
+ follow-up fixes:
+
+ "platform/mac/plugins/testplugin-onnew-onpaint.html failing after
+ r168668", commit c17be3bf5127baf94310af4b4b9bf5a57d29aaf4
+ "[Win] Unreviewed build fix after r168668.", commit
+ 4fa470ad12c38ee7d4c114541b6dd321181a8bc9
+
+ The original merged patch appears to have caused a regression in
+ fast/dom/HTMLObjectElement/object-as-frame.html.
+
+ <https://bugs.webkit.org/show_bug.cgi?id=132886>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+
</ins><span class="cx"> 2014-05-13 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Step 2 (of 2) fixing the Windows build. Add new setPageScaleFactor.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (168842 => 168843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-05-14 16:59:12 UTC (rev 168842)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-05-14 17:24:47 UTC (rev 168843)
</span><span class="lines">@@ -175,7 +175,6 @@
</span><span class="cx"> symbolWithPointer(?childItemWithTarget@HistoryItem@WebCore@@QBEPAV12@ABVString@WTF@@@Z, ?childItemWithTarget@HistoryItem@WebCore@@QEBAPEAV12@AEBVString@WTF@@@Z)
</span><span class="cx"> symbolWithPointer(?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@AAVDocument@2@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z, ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@AEAVDocument@2@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z)
</span><span class="cx"> symbolWithPointer(?commonVM@JSDOMWindowBase@WebCore@@SAAAVVM@JSC@@XZ, ?commonVM@JSDOMWindowBase@WebCore@@SAAEAVVM@JSC@@XZ)
</span><del>- symbolWithPointer(?contentDocument@HTMLFrameOwnerElement@WebCore@@QBEPAVDocument@2@XZ, ?contentDocument@HTMLFrameOwnerElement@WebCore@@QEBAPEAVDocument@2@XZ)
</del><span class="cx"> symbolWithPointer(?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z, ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@AEBVString@4@@Z)
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> symbolWithPointer(?createCFString@String@WTF@@QBE?AV?$RetainPtr@PBU__CFString@@@2@XZ, ?createCFString@String@WTF@@QEBA?AV?$RetainPtr@PEBU__CFString@@@2@XZ)
</span><span class="lines">@@ -204,7 +203,6 @@
</span><span class="cx"> symbolWithPointer(?getOutOfLineCachedWrapper@WebCore@@YAPAVJSObject@JSC@@PAVJSDOMGlobalObject@1@PAVNode@1@@Z, ?getOutOfLineCachedWrapper@WebCore@@YAPEAVJSObject@JSC@@PEAVJSDOMGlobalObject@1@PEAVNode@1@@Z)
</span><span class="cx"> symbolWithPointer(?hitTest@RenderView@WebCore@@QAE_NABVHitTestRequest@2@AAVHitTestResult@2@@Z, ?hitTest@RenderView@WebCore@@QEAA_NAEBVHitTestRequest@2@AEAVHitTestResult@2@@Z)
</span><span class="cx"> ?inputTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B
</span><del>- symbolWithPointer(?iframeTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B,?iframeTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B)
</del><span class="cx"> symbolWithPointer(?intersects@IntRect@WebCore@@QBE_NABV12@@Z, ?intersects@IntRect@WebCore@@QEBA_NAEBV12@@Z)
</span><span class="cx"> symbolWithPointer(?item@StaticNodeList@WebCore@@UBEPAVNode@2@I@Z, ?item@StaticNodeList@WebCore@@UEBAPEAVNode@2@I@Z)
</span><span class="cx"> ?selectTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B
</span><span class="lines">@@ -325,7 +323,7 @@
</span><span class="cx"> symbolWithPointer(?toRange@WebCore@@YAPAVRange@1@VJSValue@JSC@@@Z, ?toRange@WebCore@@YAPEAVRange@1@VJSValue@JSC@@@Z)
</span><span class="cx"> symbolWithPointer(?isTreeScope@Node@WebCore@@QBE_NXZ, ?isTreeScope@Node@WebCore@@QEBA_NXZ)
</span><span class="cx"> symbolWithPointer(?updateEditorUINowIfScheduled@Editor@WebCore@@QAEXXZ, ?updateEditorUINowIfScheduled@Editor@WebCore@@QEAAXXZ)
</span><del>- symbolWithPointer(?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QAEXW4RunPostLayoutTasks@12@@Z, ?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QEAAXW4RunPostLayoutTasks@12@@Z)
</del><ins>+ symbolWithPointer(?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QAEXXZ, ?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QEAAXXZ)
</ins><span class="cx"> symbolWithPointer(?updateStyleIfNeeded@Document@WebCore@@QAEXXZ, ?updateStyleIfNeeded@Document@WebCore@@QEAAXXZ)
</span><span class="cx"> symbolWithPointer(?view@Document@WebCore@@QBEPAVFrameView@2@XZ, ?view@Document@WebCore@@QEBAPEAVFrameView@2@XZ)
</span><span class="cx"> symbolWithPointer(??1ContextDestructionObserver@WebCore@@MAE@XZ, ??1ContextDestructionObserver@WebCore@@MEAA@XZ)
</span></span></pre>
</div>
</div>
</body>
</html>