OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 // tabbing to links by default. | 356 // tabbing to links by default. |
357 web_prefs_->tabs_to_links = false; | 357 web_prefs_->tabs_to_links = false; |
358 web_prefs_->accelerated_2d_canvas_enabled = | 358 web_prefs_->accelerated_2d_canvas_enabled = |
359 accelerated_2d_canvas_enabled_; | 359 accelerated_2d_canvas_enabled_; |
360 web_prefs_->accelerated_compositing_enabled = | 360 web_prefs_->accelerated_compositing_enabled = |
361 accelerated_compositing_enabled_; | 361 accelerated_compositing_enabled_; |
362 // Allow those layout tests running as local files, i.e. under | 362 // Allow those layout tests running as local files, i.e. under |
363 // LayoutTests/http/tests/local, to access http server. | 363 // LayoutTests/http/tests/local, to access http server. |
364 if (layout_test_mode_) | 364 if (layout_test_mode_) |
365 web_prefs_->allow_universal_access_from_file_urls = true; | 365 web_prefs_->allow_universal_access_from_file_urls = true; |
| 366 web_prefs_->visual_word_movement_enabled = false; |
366 } | 367 } |
367 } | 368 } |
368 | 369 |
369 // static | 370 // static |
370 bool TestShell::RemoveWindowFromList(gfx::NativeWindow window) { | 371 bool TestShell::RemoveWindowFromList(gfx::NativeWindow window) { |
371 WindowList::iterator entry = | 372 WindowList::iterator entry = |
372 std::find(TestShell::windowList()->begin(), | 373 std::find(TestShell::windowList()->begin(), |
373 TestShell::windowList()->end(), | 374 TestShell::windowList()->end(), |
374 window); | 375 window); |
375 if (entry != TestShell::windowList()->end()) { | 376 if (entry != TestShell::windowList()->end()) { |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
655 webkit::WebPluginInfo plugin_info = plugins->at(i); | 656 webkit::WebPluginInfo plugin_info = plugins->at(i); |
656 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { | 657 for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { |
657 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { | 658 if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { |
658 plugins->erase(plugins->begin() + i); | 659 plugins->erase(plugins->begin() + i); |
659 } | 660 } |
660 } | 661 } |
661 } | 662 } |
662 } | 663 } |
663 | 664 |
664 } // namespace webkit_glue | 665 } // namespace webkit_glue |
OLD | NEW |