Diff
Modified: branches/safari-536.28-branch/LayoutTests/ChangeLog (137617 => 137618)
--- branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/LayoutTests/ChangeLog 2012-12-13 19:02:07 UTC (rev 137618)
@@ -1,5 +1,9 @@
2012-12-13 Lucas Forschler <[email protected]>
+ Rollout r134834
+
+2012-12-13 Lucas Forschler <[email protected]>
+
Rollout r134991
2012-12-12 Lucas Forschler <[email protected]>
Deleted: branches/safari-536.28-branch/LayoutTests/plugins/npp-new-fails-expected.txt (137617 => 137618)
--- branches/safari-536.28-branch/LayoutTests/plugins/npp-new-fails-expected.txt 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/LayoutTests/plugins/npp-new-fails-expected.txt 2012-12-13 19:02:07 UTC (rev 137618)
@@ -1,8 +0,0 @@
-
-http://webkit.org/b/95026 - Tests that access to the plug-in script object after the plug-in fails to initialize doesn't crash
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Did not crash trying to access the plug-in script object.
-
Deleted: branches/safari-536.28-branch/LayoutTests/plugins/npp-new-fails.html (137617 => 137618)
--- branches/safari-536.28-branch/LayoutTests/plugins/npp-new-fails.html 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/LayoutTests/plugins/npp-new-fails.html 2012-12-13 19:02:07 UTC (rev 137618)
@@ -1,30 +0,0 @@
-<head>
-<script src=""
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-function runTest()
-{
- var foo = document.getElementById("TestElement").someMadeUpBar;
-
- testPassed("Did not crash trying to access the plug-in script object.");
-
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-</script>
-
-</head>
-<body _onload_="runTest();">
-<embed id="TestElement" type="application/x-webkit-test-netscape" test="npp-new-fails"></embed>
-<p id="description"></p>
-<div id="console"></div>
-</body>
-
-<script>
-description("http://webkit.org/b/95026 - Tests that access to the plug-in script object after the plug-in fails to initialize doesn't crash");
-</script>
Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (137617 => 137618)
--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-12-13 19:02:07 UTC (rev 137618)
@@ -1,5 +1,9 @@
2012-12-13 Lucas Forschler <[email protected]>
+ Rollout r134834
+
+2012-12-13 Lucas Forschler <[email protected]>
+
Rollout r134991
2012-12-06 Anders Carlsson <[email protected]>
Modified: branches/safari-536.28-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (137617 => 137618)
--- branches/safari-536.28-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-12-13 19:02:07 UTC (rev 137618)
@@ -545,10 +545,6 @@
if (m_isWaitingForSynchronousInitialization)
return 0;
- // The plug-in can be null here if it failed to initialize previously.
- if (!m_plugin)
- return 0;
-
// If the plug-in exists but is not initialized then we're still initializing asynchronously.
// We need to wait here until initialization has either succeeded or failed.
if (m_plugin->isBeingAsynchronouslyInitialized()) {
@@ -557,7 +553,7 @@
m_isWaitingForSynchronousInitialization = false;
}
- // The plug-in can be null here if it still failed to initialize.
+ // The plug-in can be null here if it failed to initialize.
if (!m_isInitialized || !m_plugin)
return 0;
Modified: branches/safari-536.28-branch/Tools/ChangeLog (137617 => 137618)
--- branches/safari-536.28-branch/Tools/ChangeLog 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/Tools/ChangeLog 2012-12-13 19:02:07 UTC (rev 137618)
@@ -1,5 +1,9 @@
2012-12-13 Lucas Forschler <[email protected]>
+ Rollout r134834
+
+2012-12-13 Lucas Forschler <[email protected]>
+
Rollout r134991
2012-11-26 Lucas Forschler <[email protected]>
Modified: branches/safari-536.28-branch/Tools/DumpRenderTree/DumpRenderTree.gypi (137617 => 137618)
--- branches/safari-536.28-branch/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/Tools/DumpRenderTree/DumpRenderTree.gypi 2012-12-13 19:02:07 UTC (rev 137618)
@@ -66,7 +66,6 @@
'TestNetscapePlugIn/Tests/GetURLWithJavaScriptURL.cpp',
'TestNetscapePlugIn/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp',
'TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp',
- 'TestNetscapePlugIn/Tests/NPPNewFails.cpp',
'TestNetscapePlugIn/Tests/NPRuntimeCallsWithNullNPP.cpp',
'TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp',
'TestNetscapePlugIn/Tests/NPRuntimeRemoveProperty.cpp',
Modified: branches/safari-536.28-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (137617 => 137618)
--- branches/safari-536.28-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2012-12-13 19:02:07 UTC (rev 137618)
@@ -70,7 +70,6 @@
4437730F125CBC4D00AAE02C /* WebArchiveDumpSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A997820FCDE86400580F10 /* WebArchiveDumpSupport.h */; };
4AD6A11413C8124000EA9737 /* FormValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD6A11313C8124000EA9737 /* FormValue.cpp */; };
5106803E15CC7B10001A8A23 /* SlowNPPNew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5106803D15CC7B10001A8A23 /* SlowNPPNew.cpp */; };
- 5113DE6715F6CBE5005EC8B3 /* NPPNewFails.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5113DE6615F6CBE5005EC8B3 /* NPPNewFails.cpp */; };
515F429C15C07872007C8F90 /* PluginScriptableObjectOverridesAllProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515F429B15C07872007C8F90 /* PluginScriptableObjectOverridesAllProperties.cpp */; };
5185F6B210714E07007AA393 /* HistoryDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5185F69F10714A57007AA393 /* HistoryDelegate.mm */; };
5185F6B310714E12007AA393 /* HistoryDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5185F69E10714A57007AA393 /* HistoryDelegate.h */; };
@@ -277,7 +276,6 @@
44A997830FCDE86400580F10 /* WebArchiveDumpSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebArchiveDumpSupport.cpp; path = cf/WebArchiveDumpSupport.cpp; sourceTree = "<group>"; };
4AD6A11313C8124000EA9737 /* FormValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormValue.cpp; sourceTree = "<group>"; };
5106803D15CC7B10001A8A23 /* SlowNPPNew.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SlowNPPNew.cpp; path = TestNetscapePlugIn/Tests/SlowNPPNew.cpp; sourceTree = SOURCE_ROOT; };
- 5113DE6615F6CBE5005EC8B3 /* NPPNewFails.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPPNewFails.cpp; sourceTree = "<group>"; };
515C0CCF15EE785700F5A613 /* LogNPPSetWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LogNPPSetWindow.cpp; sourceTree = "<group>"; };
515F429B15C07872007C8F90 /* PluginScriptableObjectOverridesAllProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginScriptableObjectOverridesAllProperties.cpp; sourceTree = "<group>"; };
5185F69E10714A57007AA393 /* HistoryDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HistoryDelegate.h; path = mac/HistoryDelegate.h; sourceTree = "<group>"; };
@@ -548,7 +546,6 @@
1AD4CB2012A6D1350027A7AF /* GetUserAgentWithNullNPPFromNPPNew.cpp */,
515C0CCF15EE785700F5A613 /* LogNPPSetWindow.cpp */,
1ACF898B132EF41C00E915D4 /* NPDeallocateCalledBeforeNPShutdown.cpp */,
- 5113DE6615F6CBE5005EC8B3 /* NPPNewFails.cpp */,
C031182A134E4A2B00919757 /* NPPSetWindowCalledDuringDestruction.cpp */,
1AD8683D163B2FD000A28583 /* NPRuntimeCallsWithNullNPP.cpp */,
1A24BAA8120734EE00FBB059 /* NPRuntimeObjectFromDestroyedPlugin.cpp */,
@@ -909,7 +906,6 @@
515F429C15C07872007C8F90 /* PluginScriptableObjectOverridesAllProperties.cpp in Sources */,
5106803E15CC7B10001A8A23 /* SlowNPPNew.cpp in Sources */,
51CACBD815D96FD000EB53A2 /* EvaluateJSWithinNPP_New.cpp in Sources */,
- 5113DE6715F6CBE5005EC8B3 /* NPPNewFails.cpp in Sources */,
1C5C9B2E15F103AA0035558E /* LogNPPSetWindow.cpp in Sources */,
1AD8683F163B2FD000A28583 /* NPRuntimeCallsWithNullNPP.cpp in Sources */,
);
Deleted: branches/safari-536.28-branch/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/NPPNewFails.cpp (137617 => 137618)
--- branches/safari-536.28-branch/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/NPPNewFails.cpp 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/NPPNewFails.cpp 2012-12-13 19:02:07 UTC (rev 137618)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "PluginTest.h"
-
-#include <string.h>
-
-using namespace std;
-
-class NPPNewFails : public PluginTest {
-public:
- NPPNewFails(NPP npp, const string& identifier)
- : PluginTest(npp, identifier)
- {
- }
-
-private:
-
- virtual NPError NPP_New(NPMIMEType pluginType, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData *saved)
- {
- return NPERR_GENERIC_ERROR;
- }
-};
-
-static PluginTest::Register<NPPNewFails> nppNewFails("npp-new-fails");
Modified: branches/safari-536.28-branch/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj (137617 => 137618)
--- branches/safari-536.28-branch/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj 2012-12-13 19:02:07 UTC (rev 137618)
@@ -426,10 +426,6 @@
>
</File>
<File
- RelativePath="..\Tests\NPPNewFails.cpp"
- >
- </File>
- <File
RelativePath="..\Tests\NPPSetWindowCalledDuringDestruction.cpp"
>
</File>
Modified: branches/safari-536.28-branch/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro (137617 => 137618)
--- branches/safari-536.28-branch/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro 2012-12-13 18:55:49 UTC (rev 137617)
+++ branches/safari-536.28-branch/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro 2012-12-13 19:02:07 UTC (rev 137618)
@@ -22,7 +22,6 @@
Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp \
Tests/GetUserAgentWithNullNPPFromNPPNew.cpp \
Tests/NPDeallocateCalledBeforeNPShutdown.cpp \
- Tests/NPPNewFails.cpp \
Tests/NPPSetWindowCalledDuringDestruction.cpp \
Tests/NPRuntimeCallsWithNullNPP.cpp \
Tests/NPRuntimeObjectFromDestroyedPlugin.cpp \
