| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "components/test_runner/test_runner.h" | 5 #include "components/test_runner/test_runner.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 2298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2309 } else if (key == "WebKitDisableReadingFromCanvas") { | 2309 } else if (key == "WebKitDisableReadingFromCanvas") { |
| 2310 prefs->disable_reading_from_canvas = value->BooleanValue(); | 2310 prefs->disable_reading_from_canvas = value->BooleanValue(); |
| 2311 } else if (key == "WebKitStrictMixedContentChecking") { | 2311 } else if (key == "WebKitStrictMixedContentChecking") { |
| 2312 prefs->strict_mixed_content_checking = value->BooleanValue(); | 2312 prefs->strict_mixed_content_checking = value->BooleanValue(); |
| 2313 } else if (key == "WebKitStrictPowerfulFeatureRestrictions") { | 2313 } else if (key == "WebKitStrictPowerfulFeatureRestrictions") { |
| 2314 prefs->strict_powerful_feature_restrictions = value->BooleanValue(); | 2314 prefs->strict_powerful_feature_restrictions = value->BooleanValue(); |
| 2315 } else if (key == "WebKitShouldRespectImageOrientation") { | 2315 } else if (key == "WebKitShouldRespectImageOrientation") { |
| 2316 prefs->should_respect_image_orientation = value->BooleanValue(); | 2316 prefs->should_respect_image_orientation = value->BooleanValue(); |
| 2317 } else if (key == "WebKitWebSecurityEnabled") { | 2317 } else if (key == "WebKitWebSecurityEnabled") { |
| 2318 prefs->web_security_enabled = value->BooleanValue(); | 2318 prefs->web_security_enabled = value->BooleanValue(); |
| 2319 } else if (key == "WebKitSpatialNavigationEnabled") { |
| 2320 prefs->spatial_navigation_enabled = value->BooleanValue(); |
| 2319 } else { | 2321 } else { |
| 2320 std::string message("Invalid name for preference: "); | 2322 std::string message("Invalid name for preference: "); |
| 2321 message.append(key); | 2323 message.append(key); |
| 2322 delegate_->PrintMessage(std::string("CONSOLE MESSAGE: ") + message + "\n"); | 2324 delegate_->PrintMessage(std::string("CONSOLE MESSAGE: ") + message + "\n"); |
| 2323 } | 2325 } |
| 2324 delegate_->ApplyPreferences(); | 2326 delegate_->ApplyPreferences(); |
| 2325 } | 2327 } |
| 2326 | 2328 |
| 2327 std::string TestRunner::GetAcceptLanguages() const { | 2329 std::string TestRunner::GetAcceptLanguages() const { |
| 2328 return layout_test_runtime_flags_.accept_languages(); | 2330 return layout_test_runtime_flags_.accept_languages(); |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2718 | 2720 |
| 2719 void TestRunner::NotifyDone() { | 2721 void TestRunner::NotifyDone() { |
| 2720 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && | 2722 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && |
| 2721 work_queue_.is_empty()) | 2723 work_queue_.is_empty()) |
| 2722 delegate_->TestFinished(); | 2724 delegate_->TestFinished(); |
| 2723 layout_test_runtime_flags_.set_wait_until_done(false); | 2725 layout_test_runtime_flags_.set_wait_until_done(false); |
| 2724 OnLayoutTestRuntimeFlagsChanged(); | 2726 OnLayoutTestRuntimeFlagsChanged(); |
| 2725 } | 2727 } |
| 2726 | 2728 |
| 2727 } // namespace test_runner | 2729 } // namespace test_runner |
| OLD | NEW |