Commit bb993895 authored by darin's avatar darin
Browse files

- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4291

          dumpAsText doesn't work with XHTML documents

        * DumpRenderTree/DumpRenderTree.m: (dump): Dump the innerText of the document element
        rather than of the body element. This works with typical XHTML documents. We can probably
        do something even better in the long run, but this fixes the immediate issue.

        - separate tweak

        * Scripts/run-webkit-tests: Show the results in the current built Safari by using
        run-safari instead of just using "open", which often runs another copy of Safari instead.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@10538 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent cb221b0d
2005-09-14 Darin Adler <darin@apple.com>
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4291
dumpAsText doesn't work with XHTML documents
* DumpRenderTree/DumpRenderTree.m: (dump): Dump the innerText of the document element
rather than of the body element. This works with typical XHTML documents. We can probably
do something even better in the long run, but this fixes the immediate issue.
- separate tweak
* Scripts/run-webkit-tests: Show the results in the current built Safari by using
run-safari instead of just using "open", which often runs another copy of Safari instead.
2005-09-11 Mark Rowe <opendarwin.org@bdash.net.nz>
Reviewed, tweaked, and landed by Darin.
......
......@@ -180,9 +180,9 @@ static void dump(void)
NSString *result = nil;
if (dumpTree) {
if (dumpAsText) {
DOMDocument *document = [frame DOMDocument];
if ([document isKindOfClass:[DOMHTMLDocument class]])
result = [[[(DOMHTMLDocument *)document body] innerText] stringByAppendingString:@"\n"];
DOMElement *documentElement = [[frame DOMDocument] documentElement];
if ([documentElement isKindOfClass:[DOMHTMLElement class]])
result = [[(DOMHTMLElement *)documentElement innerText] stringByAppendingString:@"\n"];
} else
result = [frame renderTreeAsExternalRepresentation];
......
......@@ -514,7 +514,7 @@ if ($counts{match} && $counts{match} == $count) {
print HTML "</html>\n";
close HTML;
system "open", $testResults;
system "WebKitTools/Scripts/run-safari", $testResults;
}
sub printLeaks
......@@ -524,12 +524,15 @@ sub printLeaks
print "\n" unless $atLineStart;
$atLineStart = 1;
print " ? checking for leaks in $toolName\n";
# we are excluding the following reported leaks so they don't get in our way of finding WebKit leaks:
# pthread_create: false positive leak of 'THRD', Radar 3387783
# _CFPreferencesDomainDeepCopyDictionary: leak apparently in CFPreferences, Radar 4220786
# We are excluding the following reported leaks so they don't get in our way when looking for WebKit leaks:
#
# pthread_create: false positive leak of 'THRD', Radar 3387783
# _CFPreferencesDomainDeepCopyDictionary: leak apparently in CFPreferences, Radar 4220786
#
# Note that this exclusion doesn't quite work right; sometimes a leak of 'THRD' with no stack trace will
# still appear in the leaks output.
print " ? checking for leaks in $toolName\n";
my $leaksOutput = `leaks -exclude pthread_create -exclude _CFPreferencesDomainDeepCopyDictionary $toolPID`;
my ($count, $bytes) = $leaksOutput =~ /Process $toolPID: (\d+) leaks? for (\d+) total/;
my ($excluded) = $leaksOutput =~ /(\d+) leaks? excluded/;
......
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