Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(487)

Side by Side Diff: webkit/tools/test_shell/test_shell.cc

Issue 2843005: Rolls WebKit 61233:61234 (Enable HTML5 Lexer) (Closed)
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/tools/test_shell/test_shell.h ('k') | webkit/tools/test_shell/test_shell_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #undef LOG 5 #undef LOG
6 6
7 #include "webkit/tools/test_shell/test_shell.h" 7 #include "webkit/tools/test_shell/test_shell.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob); 99 DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob);
100 }; 100 };
101 101
102 } // namespace 102 } // namespace
103 103
104 // Initialize static member variable 104 // Initialize static member variable
105 WindowList* TestShell::window_list_; 105 WindowList* TestShell::window_list_;
106 WebPreferences* TestShell::web_prefs_ = NULL; 106 WebPreferences* TestShell::web_prefs_ = NULL;
107 bool TestShell::developer_extras_enabled_ = false; 107 bool TestShell::developer_extras_enabled_ = false;
108 bool TestShell::enable_html5_parser_ = false; 108 bool TestShell::enable_html5_parser_ = true;
109 bool TestShell::inspector_test_mode_ = false; 109 bool TestShell::inspector_test_mode_ = false;
110 bool TestShell::layout_test_mode_ = false; 110 bool TestShell::layout_test_mode_ = false;
111 bool TestShell::allow_external_pages_ = false; 111 bool TestShell::allow_external_pages_ = false;
112 int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs; 112 int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs;
113 bool TestShell::test_is_preparing_ = false; 113 bool TestShell::test_is_preparing_ = false;
114 bool TestShell::test_is_pending_ = false; 114 bool TestShell::test_is_pending_ = false;
115 115
116 TestShell::TestShell() 116 TestShell::TestShell()
117 : m_mainWnd(NULL), 117 : m_mainWnd(NULL),
118 m_editWnd(NULL), 118 m_editWnd(NULL),
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 809
810 void ClearCache() { 810 void ClearCache() {
811 // Used in benchmarking, Ignored for test_shell. 811 // Used in benchmarking, Ignored for test_shell.
812 } 812 }
813 813
814 std::string GetProductVersion() { 814 std::string GetProductVersion() {
815 return std::string("Chrome/0.0.0.0"); 815 return std::string("Chrome/0.0.0.0");
816 } 816 }
817 817
818 } // namespace webkit_glue 818 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell.h ('k') | webkit/tools/test_shell/test_shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698