git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d86ed83)
LayoutTests:
authorggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jan 2006 18:13:37 +0000 (18:13 +0000)
committerggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jan 2006 18:13:37 +0000 (18:13 +0000)
        Rolling out this layout test for now, until we can get plugin testing
        working.

        * fast/plugins/netscape-back-forward.html: Removed.

WebKitTools:

        Temporarily rolling out plugin support from DumpRenderTree because it
        caused lots of layout test regressions.

        * DumpRenderTree/DumpRenderTree.m:
        (main): Remove invisible window added to support plugins.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@11913 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/plugins/netscape-back-forward.html [deleted file] patch | blob | history
WebKitTools/ChangeLog patch | blob | history
WebKitTools/DumpRenderTree/DumpRenderTree.m patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cb483cf74f9c7876eb75e056d13e35be7fc35439..4eab450ec5fd9c46e2e5cae9a4aa30ed60cf9107 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-06  Geoffrey Garen  <ggaren@apple.com>
+
+        Rolling out this layout test for now, until we can get plugin testing
+        working.
+
+        * fast/plugins/netscape-back-forward.html: Removed.
+
 2006-01-06  Alexey Proskuryakov  <ap@nypop.com>
 
         Reviewed by Darin.
diff --git a/LayoutTests/fast/plugins/netscape-back-forward.html b/LayoutTests/fast/plugins/netscape-back-forward.html
deleted file mode 100644 (file)
index b1536e7..0000000
--- a/LayoutTests/fast/plugins/netscape-back-forward.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<html>
-<head>
-<script>
-    /* Helper functions */
-    function print(message) {
-        var paragraph = document.createElement("p");
-        paragraph.appendChild(document.createTextNode(message));
-        document.getElementById("console").appendChild(paragraph);
-    }
-
-    /* Evaluator -- use for evaluating an expression in a funny way */
-    var Evaluator = new Object();
-
-    Evaluator.evaluateAfterBackForwardNavigation = function(expression)
-    {
-        /* onload doesn't fire after a back/forward navigation, but timers get restored.
-         * So, to execute a script after the back/forward navigation has completed, 
-         * we set a timer.
-         */
-        Evaluator.interval = window.setInterval("Evaluator.evaluate(" + expression + ")", 1000);
-        window.location.href = "resources/go-back.html";
-    }
-
-    Evaluator.evaluate = function(expression)
-    {
-        window.clearInterval(Evaluator.interval);
-        eval(expression);
-    }
-
-    /* Test */
-    
-    var Test = new Object();
-
-    Test.didReceiveCallback = false;
-
-    Test.callback = function()
-    {
-        Test.didReceiveCallback = true;
-        print('callback received from plugin');
-    }
-    
-    Test.continueAfterBackForwardNavigation = function()
-    {
-        print("----- AFTER back/forward navigation: -----");
-
-        try {
-            var plugin = document.embeds["testPlugin"];
-            if (plugin.property)
-                print("plugin.property is '" + plugin.property + "'");
-
-            // Netscape plugins seem to be able to call window-level functions only
-            window.callback = Test.callback;
-            if (plugin.testCallback)
-                plugin.testCallback("callback");
-            delete window.callback;
-                
-            if (plugin.property && Test.didReceiveCallback)
-                print ("PASS");
-            else
-                print("FAIL");
-        }
-        catch (e) {
-            print("FAIL");
-        }
-        
-        if (window.layoutTestController) {
-            layoutTestController.notifyDone();
-        }
-    }
-    
-    Test.run = function()
-    {
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            layoutTestController.waitUntilDone();
-        }
-        
-        Evaluator.evaluateAfterBackForwardNavigation('Test.continueAfterBackForwardNavigation()');    
-    }
-</script>
-</head>
-<body onload="Test.run()">
-<p>Bug: <a href="http://bugzilla.opendarwin.org/show_bug.cgi?id=6318">REGRESSION: Repro crash in JS called from Flash on bdash.net.nz</a></p>
-<p>If this test passes, you will see a PASS messge below.</p>
-<hr>
-<embed name="testPlugin" width="0" height="0" src="" type="application/x-webkit-test-netscape"></embed>
-<div id="console"></div>
-</body>
-</html>
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 231e4bf869ec8d6d363eaf810a17eae032840fd4..4bc6a580951b78fc1055d120e8d04b152f108a68 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-06  Geoffrey Garen  <ggaren@apple.com>
+
+        Temporarily rolling out plugin support from DumpRenderTree because it
+        caused lots of layout test regressions.
+
+        * DumpRenderTree/DumpRenderTree.m:
+        (main): Remove invisible window added to support plugins.
+
 2006-01-06  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by darin.
diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.m b/WebKitTools/DumpRenderTree/DumpRenderTree.m
index 2b07205a076f946efe0dc510996638b19ccb8bbe..1338c73d9e4db719c7ab980a31629377a4e312aa 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.m
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.m
@@ -34,7 +34,6 @@
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebPreferences.h>
 #import <WebKit/WebView.h>
-#import <WebKit/WebPluginDatabase.h>
 
 #import <Carbon/Carbon.h>                           // for GetCurrentEventTime()
 #import <ApplicationServices/ApplicationServices.h> // for CMSetDefaultProfileBySpace
@@ -186,16 +185,6 @@ int main(int argc, const char *argv[])
     localPasteboard = [NSPasteboard pasteboardWithUniqueName];
 
     WebView *webView = [[WebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)];
-    NSWindow *window = [[NSWindow alloc] initWithContentRect:NSZeroRect 
-                                                   styleMask:NSBorderlessWindowMask 
-                                                     backing:NSBackingStoreNonretained 
-                                                       defer:YES];
-    [window setContentView:webView];
-    
-    NSString *pwd = [[NSString stringWithCString:argv[0]] stringByDeletingLastPathComponent];
-    [WebPluginDatabase setAdditionalWebPlugInPaths:[NSArray arrayWithObject:pwd]];
-    [[WebPluginDatabase installedPlugins] refresh];    
-
     WaitUntilDoneDelegate *delegate = [[WaitUntilDoneDelegate alloc] init];
     EditingDelegate *editingDelegate = [[EditingDelegate alloc] init];
     [webView setFrameLoadDelegate:delegate];
@@ -234,7 +223,6 @@ int main(int argc, const char *argv[])
     [webView setUIDelegate:nil];
 
     [webView release];
-    [window release];
     [delegate release];
     [editingDelegate release];
 
Mirror of the WebKit open source project from svn.webkit.org.