Commit 35836b92 authored by ap's avatar ap

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: http://svn.webkit.org/repository/webkit/trunk@17617 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b908d861
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
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
......
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.
......
......@@ -74,14 +74,14 @@ - (id)init
- (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 @@ - (BOOL)webView:(WebView *)webView shouldInsertNode:(DOMNode *)node replacingDOM
"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 @@ - (BOOL)webView:(WebView *)webView shouldInsertText:(NSString *)text replacingDO
"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 @@ - (BOOL)webView:(WebView *)webView shouldChangeSelectedDOMRange:(DOMRange *)curr
"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]);
}
......
......@@ -41,7 +41,8 @@ @implementation UIDelegate
- (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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment