Reviewed by Maciej.

        Make sure that alerts and delegate output made after notifyDone() are ignored, rather than
        being attributed to the next test.

WebKitTools:
        * DumpRenderTree/EditingDelegate.m:
        (-[EditingDelegate webView:shouldBeginEditingInDOMRange:]):
        (-[EditingDelegate webView:shouldEndEditingInDOMRange:]):
        (-[EditingDelegate webView:shouldInsertNode:replacingDOMRange:givenAction:]):
        (-[EditingDelegate webView:shouldInsertText:replacingDOMRange:givenAction:]):
        (-[EditingDelegate webView:shouldDeleteDOMRange:]):
        (-[EditingDelegate webView:shouldChangeSelectedDOMRange:toDOMRange:affinity:stillSelecting:]):
        (-[EditingDelegate webView:shouldApplyStyle:toElementsInDOMRange:]):
        (-[EditingDelegate webView:shouldChangeTypingStyle:toStyle:]):
        (-[EditingDelegate webViewDidBeginEditing:]):
        (-[EditingDelegate webViewDidChange:]):
        (-[EditingDelegate webViewDidEndEditing:]):
        (-[EditingDelegate webViewDidChangeTypingStyle:]):
        (-[EditingDelegate webViewDidChangeSelection:]):
        * DumpRenderTree/UIDelegate.m:
        (-[UIDelegate webView:runJavaScriptAlertPanelWithMessage:]):

LayoutTests:
        Removed leftover results from the previous test.

        * editing/selection/drag-to-contenteditable-iframe-expected.txt:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a3e75fb0feafa0449d6b72b60ac506e768b1d7e9..b5779b5d24cc8154aa3a612bb5aab3acf403dd9a 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-06  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Maciej.
+
+        Removed leftover results from the previous test.
+
+        * editing/selection/drag-to-contenteditable-iframe-expected.txt:
+
 2006-11-07  Mark Rowe  <bdash@webkit.org>
 
         http://bugs.webkit.org/show_bug.cgi?id=11526

diff --git a/LayoutTests/editing/selection/drag-to-contenteditable-iframe-expected.txt b/LayoutTests/editing/selection/drag-to-contenteditable-iframe-expected.txt
index 1fbad3586aab4924fe3336f0a6e9ac5ecc96f6fd..13d1c80ca48323ff8d79a7f7fe755760c7241e03 100644 (file)
--- a/LayoutTests/editing/selection/drag-to-contenteditable-iframe-expected.txt
+++ b/LayoutTests/editing/selection/drag-to-contenteditable-iframe-expected.txt
@@ -1,8 +1,3 @@
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 2 of BODY > HTML > #document to 2 of BODY > HTML > #document givenAction:WebViewInsertActionDropped
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of BODY > HTML > #document to 2 of BODY > HTML > #document toDOMRange:range from 0 of #text > BODY > HTML > #document to 5 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 4 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document givenAction:WebViewInsertActionDropped
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 229ff85d74963664798fec5dd67e8892c6856229..46520cd051687bfa462d667a6c45d8949b53b5f0 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,27 @@
+2006-11-06  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Maciej.
+
+        Make sure that alerts and delegate output made after notifyDone() are ignored, rather than
+        being attributed to the next test.
+
+        * DumpRenderTree/EditingDelegate.m:
+        (-[EditingDelegate webView:shouldBeginEditingInDOMRange:]):
+        (-[EditingDelegate webView:shouldEndEditingInDOMRange:]):
+        (-[EditingDelegate webView:shouldInsertNode:replacingDOMRange:givenAction:]):
+        (-[EditingDelegate webView:shouldInsertText:replacingDOMRange:givenAction:]):
+        (-[EditingDelegate webView:shouldDeleteDOMRange:]):
+        (-[EditingDelegate webView:shouldChangeSelectedDOMRange:toDOMRange:affinity:stillSelecting:]):
+        (-[EditingDelegate webView:shouldApplyStyle:toElementsInDOMRange:]):
+        (-[EditingDelegate webView:shouldChangeTypingStyle:toStyle:]):
+        (-[EditingDelegate webViewDidBeginEditing:]):
+        (-[EditingDelegate webViewDidChange:]):
+        (-[EditingDelegate webViewDidEndEditing:]):
+        (-[EditingDelegate webViewDidChangeTypingStyle:]):
+        (-[EditingDelegate webViewDidChangeSelection:]):
+        * DumpRenderTree/UIDelegate.m:
+        (-[UIDelegate webView:runJavaScriptAlertPanelWithMessage:]):
+
 2006-11-06  Mark Rowe  <bdash@webkit.org>
 
         Reviewed by Alexey.

diff --git a/WebKitTools/DumpRenderTree/EditingDelegate.m b/WebKitTools/DumpRenderTree/EditingDelegate.m
index 60ef8b0ae076f111e01f2a06383ed37139360a79..c0d670d39cbd152ba68c5ea5d4f566c1dcd3bd26 100644 (file)
--- a/WebKitTools/DumpRenderTree/EditingDelegate.m
+++ b/WebKitTools/DumpRenderTree/EditingDelegate.m
@@ -74,14 +74,14 @@ extern BOOL shouldDumpEditingCallbacks;
 
 - (BOOL)webView:(WebView *)webView shouldBeginEditingInDOMRange:(DOMRange *)range
 {
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: shouldBeginEditingInDOMRange:%s\n", [[range dump] UTF8String]);
     return acceptsEditing;
 }
 
 - (BOOL)webView:(WebView *)webView shouldEndEditingInDOMRange:(DOMRange *)range
 {
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: shouldEndEditingInDOMRange:%s\n", [[range dump] UTF8String]);
     return acceptsEditing;
 }
@@ -94,7 +94,7 @@ extern BOOL shouldDumpEditingCallbacks;
         "WebViewInsertActionDropped",
     };
 
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: shouldInsertNode:%s replacingDOMRange:%s givenAction:%s\n", [[node dumpPath] UTF8String], [[range dump] UTF8String], insertactionstring[action]);
     return acceptsEditing;
 }
@@ -107,14 +107,14 @@ extern BOOL shouldDumpEditingCallbacks;
         "WebViewInsertActionDropped",
     };
 
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: shouldInsertText:%s replacingDOMRange:%s givenAction:%s\n", [[text description] UTF8String], [[range dump] UTF8String], insertactionstring[action]);
     return acceptsEditing;
 }
 
 - (BOOL)webView:(WebView *)webView shouldDeleteDOMRange:(DOMRange *)range
 {
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: shouldDeleteDOMRange:%s\n", [[range dump] UTF8String]);
     return acceptsEditing;
 }
@@ -130,52 +130,52 @@ extern BOOL shouldDumpEditingCallbacks;
         "TRUE"
     };
 
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: shouldChangeSelectedDOMRange:%s toDOMRange:%s affinity:%s stillSelecting:%s\n", [[currentRange dump] UTF8String], [[proposedRange dump] UTF8String], affinitystring[selectionAffinity], boolstring[flag]);
     return acceptsEditing;
 }
 
 - (BOOL)webView:(WebView *)webView shouldApplyStyle:(DOMCSSStyleDeclaration *)style toElementsInDOMRange:(DOMRange *)range
 {
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: shouldApplyStyle:%s toElementsInDOMRange:%s\n", [[style description] UTF8String], [[range dump] UTF8String]);
     return acceptsEditing;
 }
 
 - (BOOL)webView:(WebView *)webView shouldChangeTypingStyle:(DOMCSSStyleDeclaration *)currentStyle toStyle:(DOMCSSStyleDeclaration *)proposedStyle
 {
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: shouldChangeTypingStyle:%s toStyle:%s\n", [[currentStyle description] UTF8String], [[proposedStyle description] UTF8String]);
     return acceptsEditing;
 }
 
 - (void)webViewDidBeginEditing:(NSNotification *)notification
 {
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: webViewDidBeginEditing:%s\n", [[notification name] UTF8String]);
 }
 
 - (void)webViewDidChange:(NSNotification *)notification
 {
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: webViewDidChange:%s\n", [[notification name] UTF8String]);
 }
 
 - (void)webViewDidEndEditing:(NSNotification *)notification
 {
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: webViewDidEndEditing:%s\n", [[notification name] UTF8String]);
 }
 
 - (void)webViewDidChangeTypingStyle:(NSNotification *)notification
 {
-    if (shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: webViewDidChangeTypingStyle:%s\n", [[notification name] UTF8String]);
 }
 
 - (void)webViewDidChangeSelection:(NSNotification *)notification
 {
-    if (!doneLoading() && shouldDumpEditingCallbacks)
+    if (shouldDumpEditingCallbacks && !doneLoading())
         printf("EDITING DELEGATE: webViewDidChangeSelection:%s\n", [[notification name] UTF8String]);
 }
 

diff --git a/WebKitTools/DumpRenderTree/UIDelegate.m b/WebKitTools/DumpRenderTree/UIDelegate.m
index f3f508306edf294b25211808f235f59d146c04ca..ea5476f3fd800c48e7f4d0658e16493e02e79a49 100644 (file)
--- a/WebKitTools/DumpRenderTree/UIDelegate.m
+++ b/WebKitTools/DumpRenderTree/UIDelegate.m
@@ -41,7 +41,8 @@ DumpRenderTreeDraggingInfo *draggingInfo = nil;
 
 - (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message
 {
-    printf("ALERT: %s\n", [message UTF8String]);
+    if (!doneLoading())
+        printf("ALERT: %s\n", [message UTF8String]);
 }
 
 - (void)webView:(WebView *)sender dragImage:(NSImage *)anImage at:(NSPoint)viewLocation offset:(NSSize)initialOffset event:(NSEvent *)event pasteboard:(NSPasteboard *)pboard source:(id)sourceObj slideBack:(BOOL)slideFlag forView:(NSView *)view