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

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

Issue 3157038: Remove reference to obsolete web preference. The legacy parser no longer... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 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 | Annotate | Revision Log
« 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob); 100 DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob);
101 }; 101 };
102 102
103 } // namespace 103 } // namespace
104 104
105 // Initialize static member variable 105 // Initialize static member variable
106 WindowList* TestShell::window_list_; 106 WindowList* TestShell::window_list_;
107 WebPreferences* TestShell::web_prefs_ = NULL; 107 WebPreferences* TestShell::web_prefs_ = NULL;
108 bool TestShell::developer_extras_enabled_ = false; 108 bool TestShell::developer_extras_enabled_ = false;
109 bool TestShell::enable_html5_parser_ = true;
110 bool TestShell::layout_test_mode_ = false; 109 bool TestShell::layout_test_mode_ = false;
111 bool TestShell::allow_external_pages_ = false; 110 bool TestShell::allow_external_pages_ = false;
112 int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs; 111 int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs;
113 bool TestShell::test_is_preparing_ = false; 112 bool TestShell::test_is_preparing_ = false;
114 bool TestShell::test_is_pending_ = false; 113 bool TestShell::test_is_pending_ = false;
115 114
116 TestShell::TestShell() 115 TestShell::TestShell()
117 : m_mainWnd(NULL), 116 : m_mainWnd(NULL),
118 m_editWnd(NULL), 117 m_editWnd(NULL),
119 m_webViewHost(NULL), 118 m_webViewHost(NULL),
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 // lose the coverage of dynamic font tests in webkit test. 491 // lose the coverage of dynamic font tests in webkit test.
493 web_prefs_->remote_fonts_enabled = true; 492 web_prefs_->remote_fonts_enabled = true;
494 web_prefs_->local_storage_enabled = true; 493 web_prefs_->local_storage_enabled = true;
495 web_prefs_->application_cache_enabled = true; 494 web_prefs_->application_cache_enabled = true;
496 web_prefs_->databases_enabled = true; 495 web_prefs_->databases_enabled = true;
497 web_prefs_->allow_file_access_from_file_urls = true; 496 web_prefs_->allow_file_access_from_file_urls = true;
498 // LayoutTests were written with Safari Mac in mind which does not allow 497 // LayoutTests were written with Safari Mac in mind which does not allow
499 // tabbing to links by default. 498 // tabbing to links by default.
500 web_prefs_->tabs_to_links = false; 499 web_prefs_->tabs_to_links = false;
501 500
502 web_prefs_->enable_html5_parser = enable_html5_parser_;
503
504 // Allow those layout tests running as local files, i.e. under 501 // Allow those layout tests running as local files, i.e. under
505 // LayoutTests/http/tests/local, to access http server. 502 // LayoutTests/http/tests/local, to access http server.
506 if (layout_test_mode_) 503 if (layout_test_mode_)
507 web_prefs_->allow_universal_access_from_file_urls = true; 504 web_prefs_->allow_universal_access_from_file_urls = true;
508 } 505 }
509 } 506 }
510 507
511 // static 508 // static
512 bool TestShell::RemoveWindowFromList(gfx::NativeWindow window) { 509 bool TestShell::RemoveWindowFromList(gfx::NativeWindow window) {
513 WindowList::iterator entry = 510 WindowList::iterator entry =
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 return -1; 820 return -1;
824 } 821 }
825 822
826 bool GetFontTable(int fd, uint32_t table, uint8_t* output, 823 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
827 size_t* output_length) { 824 size_t* output_length) {
828 return false; 825 return false;
829 } 826 }
830 #endif 827 #endif
831 828
832 } // namespace webkit_glue 829 } // 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