Diff
Modified: branches/safari-536.28-branch/ChangeLog (137621 => 137622)
--- branches/safari-536.28-branch/ChangeLog 2012-12-13 19:05:54 UTC (rev 137621)
+++ branches/safari-536.28-branch/ChangeLog 2012-12-13 19:07:45 UTC (rev 137622)
@@ -1,3 +1,7 @@
+2012-12-13 Lucas Forschler <[email protected]>
+
+ Rollout r133969
+
2012-11-18 Simon Fraser <[email protected]>
Prerequisite for <rdar://problem/12725980> Fix overlay scrollbar painting in compositing layers (102442)
Modified: branches/safari-536.28-branch/LayoutTests/ChangeLog (137621 => 137622)
--- branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-12-13 19:05:54 UTC (rev 137621)
+++ branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-12-13 19:07:45 UTC (rev 137622)
@@ -1,5 +1,9 @@
2012-12-13 Lucas Forschler <[email protected]>
+ Rollout r133969
+
+2012-12-13 Lucas Forschler <[email protected]>
+
Rollout r134834
2012-12-13 Lucas Forschler <[email protected]>
Deleted: branches/safari-536.28-branch/LayoutTests/platform/mac-wk2/plugins/asynchronous-destroy-before-initialization-expected.txt (137621 => 137622)
--- branches/safari-536.28-branch/LayoutTests/platform/mac-wk2/plugins/asynchronous-destroy-before-initialization-expected.txt 2012-12-13 19:05:54 UTC (rev 137621)
+++ branches/safari-536.28-branch/LayoutTests/platform/mac-wk2/plugins/asynchronous-destroy-before-initialization-expected.txt 2012-12-13 19:07:45 UTC (rev 137622)
@@ -1,7 +0,0 @@
-Tests that when media/plugin playback is disabled (such as when in a background tab), removing a plug-in element that was never initialized does not crash.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Removing the plug-in element did not crash.
-
Deleted: branches/safari-536.28-branch/LayoutTests/platform/mac-wk2/plugins/asynchronous-destroy-before-initialization.html (137621 => 137622)
--- branches/safari-536.28-branch/LayoutTests/platform/mac-wk2/plugins/asynchronous-destroy-before-initialization.html 2012-12-13 19:05:54 UTC (rev 137621)
+++ branches/safari-536.28-branch/LayoutTests/platform/mac-wk2/plugins/asynchronous-destroy-before-initialization.html 2012-12-13 19:07:45 UTC (rev 137622)
@@ -1,45 +0,0 @@
-<head>
-<script src=""
-<script>
-
-var startTime = new Date;
-
-if (window.layoutTestController) {
- layoutTestController.overridePreference("WebKit2AsynchronousPluginInitializationEnabled", "1");
- layoutTestController.overridePreference("WebKit2AsynchronousPluginInitializationEnabledForAllPlugins", "1");
- window.internals.settings.setCanStartMedia(false);
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
-}
-
-function runTest()
-{
- if (!window.layoutTestController) {
- debug("This test can only run from within DumpRenderTree because it requires test runner internals.\n");
- return;
- }
-
- var pluginElement = document.getElementById("TestElement");
- pluginElement.parentNode.removeChild(pluginElement);
-
- testPassed("Removing the plug-in element did not crash.");
-
- var endTime = new Date;
- if (endTime - startTime > 549)
- testFailed("This test took over 549ms meaning the plug-in with a 550ms startup delay was actually initialized. It never should've been initialized.");
-
- layoutTestController.notifyDone();
-}
-</script>
-
-</head>
-<body _onload_="setTimeout('runTest()', 0)">
-<embed id="TestElement" type="application/x-webkit-test-netscape" test="slow-npp-new"></embed>
-<p id="description"></p>
-<div id="console"></div>
-</body>
-
-<script>
-description("Tests that when media/plugin playback is disabled (such as when in a background tab), removing a plug-in element that was never initialized does not crash.");
-var unused = document.body.offsetTop;
-</script>
Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (137621 => 137622)
--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-12-13 19:05:54 UTC (rev 137621)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-12-13 19:07:45 UTC (rev 137622)
@@ -1,5 +1,9 @@
2012-12-13 Lucas Forschler <[email protected]>
+ Rollout r133969
+
+2012-12-13 Lucas Forschler <[email protected]>
+
Rollout r134109
2012-12-13 Lucas Forschler <[email protected]>
Modified: branches/safari-536.28-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (137621 => 137622)
--- branches/safari-536.28-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2012-12-13 19:05:54 UTC (rev 137621)
+++ branches/safari-536.28-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2012-12-13 19:07:45 UTC (rev 137622)
@@ -199,12 +199,10 @@
void PluginProxy::destroy()
{
+ m_connection->connection()->sendSync(Messages::WebProcessConnection::DestroyPlugin(m_pluginInstanceID, m_waitingOnAsynchronousInitialization), Messages::WebProcessConnection::DestroyPlugin::Reply(), 0);
+
m_isStarted = false;
- if (!m_connection)
- return;
-
- m_connection->connection()->sendSync(Messages::WebProcessConnection::DestroyPlugin(m_pluginInstanceID, m_waitingOnAsynchronousInitialization), Messages::WebProcessConnection::DestroyPlugin::Reply(), 0);
m_connection->removePluginProxy(this);
}
Modified: branches/safari-536.28-branch/Source/WebKit2/win/WebKit2.def (137621 => 137622)
--- branches/safari-536.28-branch/Source/WebKit2/win/WebKit2.def 2012-12-13 19:05:54 UTC (rev 137621)
+++ branches/safari-536.28-branch/Source/WebKit2/win/WebKit2.def 2012-12-13 19:07:45 UTC (rev 137622)
@@ -210,7 +210,6 @@
?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
?scriptNameToCode@WebCore@@YA?AW4UScriptCode@@ABVString@WTF@@@Z
?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
- ?setCanStartMedia@Page@WebCore@@QAEX_N@Z
?setCursiveFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
?setDOMException@WebCore@@YAXPAVExecState@JSC@@H@Z
?setFantasyFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z
Modified: branches/safari-536.28-branch/Source/autotools/symbols.filter (137621 => 137622)
--- branches/safari-536.28-branch/Source/autotools/symbols.filter 2012-12-13 19:05:54 UTC (rev 137621)
+++ branches/safari-536.28-branch/Source/autotools/symbols.filter 2012-12-13 19:07:45 UTC (rev 137622)
@@ -29,7 +29,6 @@
_ZN24DumpRenderTreeSupportGtk*;
_ZN7WebCore4Page18setPageScaleFactorEfRKNS_8IntPointE;
_ZN7WebCore4Page13setPaginationERKNS0_10PaginationE;
-_ZN7WebCore4Page16setCanStartMediaEb;
_ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10ClientRectE;
_ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_14ClientRectListE;
_ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_5RangeE;
@@ -143,7 +142,6 @@
_ZN7WebCore8Document34webkitWillExitFullScreenForElementEPNS_7ElementE;
_ZN7WebCore8Document35webkitWillEnterFullScreenForElementEPNS_7ElementE;
_ZN7WebCore17JSDOMGlobalObject6s_infoE;
-
local:
_Z*;
cti*;
