diff options
Diffstat (limited to 'Tools/DumpRenderTree/DumpRenderTree.h')
| -rw-r--r-- | Tools/DumpRenderTree/DumpRenderTree.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/Tools/DumpRenderTree/DumpRenderTree.h b/Tools/DumpRenderTree/DumpRenderTree.h index 3e6323525..743e68255 100644 --- a/Tools/DumpRenderTree/DumpRenderTree.h +++ b/Tools/DumpRenderTree/DumpRenderTree.h @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -26,15 +26,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef DumpRenderTree_h -#define DumpRenderTree_h +#pragma once -// FIXME: Remove this when all platforms are using config.h -#ifndef Config_H -#include <wtf/Platform.h> -#endif - -#if PLATFORM(MAC) +#if PLATFORM(COCOA) #include "DumpRenderTreeMac.h" #elif PLATFORM(WIN) #include "DumpRenderTreeWin.h" @@ -45,6 +39,7 @@ #endif #include <string> +#include <wtf/Platform.h> #include <wtf/RefPtr.h> #if !OS(OPENBSD) @@ -62,14 +57,12 @@ void dump(); void displayWebView(); struct TestCommand { - TestCommand() : shouldDumpPixels(false), timeout(30000) { } - std::string pathOrURL; - bool shouldDumpPixels; + std::string absolutePath; + bool shouldDumpPixels { false }; std::string expectedPixelHash; - int timeout; // in ms + int timeout { 30000 }; // in ms + bool dumpJSConsoleLogInStdErr { false }; }; TestCommand parseInputLine(const std::string&); - -#endif // DumpRenderTree_h |