webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 4 insertions, 5 deletions

diff --git a/Tools/WebKitTestRunner/Options.h b/Tools/WebKitTestRunner/Options.h
index a89d25c77..5549fe464 100644
--- a/Tools/WebKitTestRunner/Options.h
+++ b/Tools/WebKitTestRunner/Options.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2013 University of Szeged. All rights reserved.
  * Copyright (C) 2013 Samsung Electronics. All rights reserved.
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -36,9 +37,7 @@
 namespace WTR {
 
 struct Options {
-    Options(double, double);
-    double longTimeout;
-    double shortTimeout;
+    Options();
     bool useWaitToDumpWatchdogTimer;
     bool forceNoTimeout;
     bool verbose;
@@ -48,9 +47,9 @@ struct Options {
     bool forceComplexText;
     bool shouldUseAcceleratedDrawing;
     bool shouldUseRemoteLayerTree;
+    bool shouldShowWebView;
     std::vector<std::string> paths;
-    double defaultLongTimeout;
-    double defaultShortTimeout;
+    std::vector<std::string> allowedHosts;
 };
 
 class Option {