diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp')
| -rw-r--r-- | WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp index aca17fb..a8028c5 100644 --- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp +++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp @@ -66,7 +66,7 @@ using namespace std; -#if !defined(NDEBUG) && (!defined(DEBUG_INTERNAL) || defined(DEBUG_ALL)) +#ifdef DEBUG_ALL const LPWSTR TestPluginDir = L"TestNetscapePlugin_Debug"; #else const LPWSTR TestPluginDir = L"TestNetscapePlugin"; @@ -671,8 +671,10 @@ void dump() COMPtr<IWebURLResponse> response; if (SUCCEEDED(dataSource->response(&response)) && response) { BSTR mimeType; - if (SUCCEEDED(response->MIMEType(&mimeType))) - ::gLayoutTestController->setDumpAsText(::gLayoutTestController->dumpAsText() | !_tcscmp(mimeType, TEXT("text/plain"))); + if (SUCCEEDED(response->MIMEType(&mimeType)) && !_tcscmp(mimeType, TEXT("text/plain"))) { + ::gLayoutTestController->setDumpAsText(true); + ::gLayoutTestController->setGeneratePixelResults(false); + } SysFreeString(mimeType); } } @@ -763,7 +765,7 @@ static bool shouldOpenWebInspector(const char* pathOrURL) static bool shouldEnableDeveloperExtras(const char* pathOrURL) { - return shouldOpenWebInspector(pathOrURL) || strstr(pathOrURL, "/inspector-enabled/") || strstr(pathOrURL, "\\inspector-enabled\\"); + return true; } static void resetDefaultsToConsistentValues(IWebPreferences* preferences) |