[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 22b5f8660ee1483d2a1c1618d78c036a5c61a967
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 24 21:58:41 2010 +0000

            Reviewed by Dan Bernstein.
    
            https://bugs.webkit.org/show_bug.cgi?id=35357
            Two editing tests fail after DumpRenderTree run loop changes
    
            AppKit decided that it wanted to group all editing commands for some reason (and thus undo
            reverted them all at once).
    
            * DumpRenderTree/mac/DumpRenderTree.mm:
            (dump): Reverted the change that made DumpRenderTree use -[NSApplication run].
            (runTest): Ditto.
            (-[DumpRenderTreeApplication isRunning]): Override isRunning with a function that always
            returns YES. This is another way to make the Java plug-in work.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55200 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 798645b..2491c10 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-24  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35357
+        Two editing tests fail after DumpRenderTree run loop changes
+
+        AppKit decided that it wanted to group all editing commands for some reason (and thus undo
+        reverted them all at once).
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (dump): Reverted the change that made DumpRenderTree use -[NSApplication run].
+        (runTest): Ditto.
+        (-[DumpRenderTreeApplication isRunning]): Override isRunning with a function that always
+        returns YES. This is another way to make the Java plug-in work.
+
 2010-02-23  Adam Roben  <aroben at apple.com>
 
         Make commit-log-editor find just-added ChangeLog files
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index 6b128df..f2f6046 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -85,6 +85,9 @@
 
 using namespace std;
 
+ at interface DumpRenderTreeApplication : NSApplication
+ at end
+
 @interface DumpRenderTreeEvent : NSEvent
 @end
 
@@ -581,14 +584,6 @@ static void runTestingServerLoop()
     }
 }
 
-static void exitApplicationRunLoop()
-{
-    [[NSApplication sharedApplication] stop:nil];
-
-    // -[NSApplication run] is blocked in a run loop waiting for an event, need to wake it up to return.
-    [[NSApplication sharedApplication] postEvent:[NSEvent otherEventWithType:NSApplicationDefined location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:0 subtype:0 data1:0 data2:0] atStart:NO];
-}
-
 static void prepareConsistentTestingEnvironment()
 {
     poseAsClass("DumpRenderTreePasteboard", "NSPasteboard");
@@ -681,7 +676,7 @@ void dumpRenderTree(int argc, const char *argv[])
 int main(int argc, const char *argv[])
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    [NSApplication sharedApplication]; // Force AppKit to init itself
+    [DumpRenderTreeApplication sharedApplication]; // Force AppKit to init itself
     dumpRenderTree(argc, argv);
     [WebCoreStatistics garbageCollectJavaScriptObjects];
     [WebCoreStatistics emptyCache]; // Otherwise SVGImages trigger false positives for Frame/Node counts    
@@ -1117,7 +1112,6 @@ void dump()
     fflush(stderr);
 
     done = YES;
-    exitApplicationRunLoop();
 }
 
 static bool shouldLogFrameLoadDelegates(const char* pathOrURL)
@@ -1235,10 +1229,11 @@ static void runTest(const string& testPathOrURL)
     [mainFrame loadRequest:[NSURLRequest requestWithURL:url]];
     [pool release];
 
-    pool = [[NSAutoreleasePool alloc] init];
-    [[NSApplication sharedApplication] run];
-    ASSERT(done);
-    [pool release];
+    while (!done) {
+        pool = [[NSAutoreleasePool alloc] init];
+        [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]]; 
+        [pool release];
+    }
 
     pool = [[NSAutoreleasePool alloc] init];
     [EventSendingController clearSavedEvents];
@@ -1303,3 +1298,13 @@ void displayWebView()
 }
 
 @end
+
+ at implementation DumpRenderTreeApplication
+
+- (BOOL)isRunning
+{
+    // <rdar://problem/7686123> Java plug-in freezes unless NSApplication is running
+    return YES;
+}
+
+ at end

-- 
WebKit Debian packaging