| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "v8_proxy.h" | 5 #include "v8_proxy.h" |
| 6 #undef LOG | 6 #undef LOG |
| 7 | 7 |
| 8 #include "webkit/tools/test_shell/test_shell.h" | 8 #include "webkit/tools/test_shell/test_shell.h" |
| 9 | 9 |
| 10 | 10 |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 442 } | 442 } |
| 443 | 443 |
| 444 void TestShell::SizeToSVG() { | 444 void TestShell::SizeToSVG() { |
| 445 SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight); | 445 SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight); |
| 446 } | 446 } |
| 447 | 447 |
| 448 void TestShell::SizeToDefault() { | 448 void TestShell::SizeToDefault() { |
| 449 SizeTo(kTestWindowWidth, kTestWindowHeight); | 449 SizeTo(kTestWindowWidth, kTestWindowHeight); |
| 450 } | 450 } |
| 451 | 451 |
| 452 void TestShell::ResetTestController() { |
| 453 layout_test_controller_->Reset(); |
| 454 event_sending_controller_->Reset(); |
| 455 |
| 456 // Reset state in the test webview delegate. |
| 457 delegate_ = new TestWebViewDelegate(this); |
| 458 webView()->SetDelegate(delegate_); |
| 459 } |
| 460 |
| 452 void TestShell::LoadURL(const wchar_t* url) { | 461 void TestShell::LoadURL(const wchar_t* url) { |
| 453 LoadURLForFrame(url, NULL); | 462 LoadURLForFrame(url, NULL); |
| 454 } | 463 } |
| 455 | 464 |
| 456 bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) { | 465 bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) { |
| 457 WebRequestCachePolicy cache_policy; | 466 WebRequestCachePolicy cache_policy; |
| 458 if (reload) { | 467 if (reload) { |
| 459 cache_policy = WebRequestReloadIgnoringCacheData; | 468 cache_policy = WebRequestReloadIgnoringCacheData; |
| 460 } else if (entry.GetPageID() != -1) { | 469 } else if (entry.GetPageID() != -1) { |
| 461 cache_policy = WebRequestReturnCacheDataElseLoad; | 470 cache_policy = WebRequestReturnCacheDataElseLoad; |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 598 | 607 |
| 599 bool IsDefaultPluginEnabled() { | 608 bool IsDefaultPluginEnabled() { |
| 600 return false; | 609 return false; |
| 601 } | 610 } |
| 602 | 611 |
| 603 std::wstring GetWebKitLocale() { | 612 std::wstring GetWebKitLocale() { |
| 604 return L"en-US"; | 613 return L"en-US"; |
| 605 } | 614 } |
| 606 | 615 |
| 607 } // namespace webkit_glue | 616 } // namespace webkit_glue |
| OLD | NEW |