diff options
Diffstat (limited to 'WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm')
| -rw-r--r-- | WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm index e280fab..c08aee5 100644 --- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm +++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm @@ -907,14 +907,15 @@ void dump() { invalidateAnyPreviousWaitToDumpWatchdog(); - bool dumpAsText = gLayoutTestController->dumpAsText(); if (dumpTree) { NSString *resultString = nil; NSData *resultData = nil; NSString *resultMimeType = @"text/plain"; - dumpAsText |= [[[mainFrame dataSource] _responseMIMEType] isEqualToString:@"text/plain"]; - gLayoutTestController->setDumpAsText(dumpAsText); + if ([[[mainFrame dataSource] _responseMIMEType] isEqualToString:@"text/plain"]) { + gLayoutTestController->setDumpAsText(true); + gLayoutTestController->setGeneratePixelResults(false); + } if (gLayoutTestController->dumpAsText()) { resultString = dumpFramesAsText(mainFrame); } else if (gLayoutTestController->dumpAsPDF()) { @@ -989,7 +990,7 @@ static bool shouldOpenWebInspector(const char* pathOrURL) static bool shouldEnableDeveloperExtras(const char* pathOrURL) { - return shouldOpenWebInspector(pathOrURL) || strstr(pathOrURL, "inspector-enabled/"); + return true; } static void resetWebViewToConsistentStateBeforeTesting() |