| 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 2303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2314 } else if (key == "WebKitDisableReadingFromCanvas") { | 2314 } else if (key == "WebKitDisableReadingFromCanvas") { |
| 2315 prefs->disable_reading_from_canvas = value->BooleanValue(); | 2315 prefs->disable_reading_from_canvas = value->BooleanValue(); |
| 2316 } else if (key == "WebKitStrictMixedContentChecking") { | 2316 } else if (key == "WebKitStrictMixedContentChecking") { |
| 2317 prefs->strict_mixed_content_checking = value->BooleanValue(); | 2317 prefs->strict_mixed_content_checking = value->BooleanValue(); |
| 2318 } else if (key == "WebKitStrictPowerfulFeatureRestrictions") { | 2318 } else if (key == "WebKitStrictPowerfulFeatureRestrictions") { |
| 2319 prefs->strict_powerful_feature_restrictions = value->BooleanValue(); | 2319 prefs->strict_powerful_feature_restrictions = value->BooleanValue(); |
| 2320 } else if (key == "WebKitShouldRespectImageOrientation") { | 2320 } else if (key == "WebKitShouldRespectImageOrientation") { |
| 2321 prefs->should_respect_image_orientation = value->BooleanValue(); | 2321 prefs->should_respect_image_orientation = value->BooleanValue(); |
| 2322 } else if (key == "WebKitWebSecurityEnabled") { | 2322 } else if (key == "WebKitWebSecurityEnabled") { |
| 2323 prefs->web_security_enabled = value->BooleanValue(); | 2323 prefs->web_security_enabled = value->BooleanValue(); |
| 2324 } else if (key == "WebKitSpatialNavigationEnabled") { |
| 2325 prefs->spatial_navigation_enabled = value->BooleanValue(); |
| 2324 } else { | 2326 } else { |
| 2325 std::string message("Invalid name for preference: "); | 2327 std::string message("Invalid name for preference: "); |
| 2326 message.append(key); | 2328 message.append(key); |
| 2327 delegate_->PrintMessage(std::string("CONSOLE MESSAGE: ") + message + "\n"); | 2329 delegate_->PrintMessage(std::string("CONSOLE MESSAGE: ") + message + "\n"); |
| 2328 } | 2330 } |
| 2329 delegate_->ApplyPreferences(); | 2331 delegate_->ApplyPreferences(); |
| 2330 } | 2332 } |
| 2331 | 2333 |
| 2332 std::string TestRunner::GetAcceptLanguages() const { | 2334 std::string TestRunner::GetAcceptLanguages() const { |
| 2333 return layout_test_runtime_flags_.accept_languages(); | 2335 return layout_test_runtime_flags_.accept_languages(); |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2734 | 2736 |
| 2735 void TestRunner::NotifyDone() { | 2737 void TestRunner::NotifyDone() { |
| 2736 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && | 2738 if (layout_test_runtime_flags_.wait_until_done() && !topLoadingFrame() && |
| 2737 work_queue_.is_empty()) | 2739 work_queue_.is_empty()) |
| 2738 delegate_->TestFinished(); | 2740 delegate_->TestFinished(); |
| 2739 layout_test_runtime_flags_.set_wait_until_done(false); | 2741 layout_test_runtime_flags_.set_wait_until_done(false); |
| 2740 OnLayoutTestRuntimeFlagsChanged(); | 2742 OnLayoutTestRuntimeFlagsChanged(); |
| 2741 } | 2743 } |
| 2742 | 2744 |
| 2743 } // namespace test_runner | 2745 } // namespace test_runner |
| OLD | NEW |