| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 TestWebViewDelegate* delegate() { return delegate_.get(); } | 111 TestWebViewDelegate* delegate() { return delegate_.get(); } |
| 112 TestNavigationController* navigation_controller() { | 112 TestNavigationController* navigation_controller() { |
| 113 return navigation_controller_.get(); | 113 return navigation_controller_.get(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 // Resets the LayoutTestController and EventSendingController. Should be | 116 // Resets the LayoutTestController and EventSendingController. Should be |
| 117 // called before loading a page, since some end-editing event notifications | 117 // called before loading a page, since some end-editing event notifications |
| 118 // may arrive after the previous page has finished dumping its text and | 118 // may arrive after the previous page has finished dumping its text and |
| 119 // therefore end up in the next test's results if the messages are still | 119 // therefore end up in the next test's results if the messages are still |
| 120 // enabled. | 120 // enabled. |
| 121 void ResetTestController() { | 121 void ResetTestController(); |
| 122 layout_test_controller_->Reset(); | |
| 123 event_sending_controller_->Reset(); | |
| 124 | |
| 125 // Reset state in the test webview delegate. | |
| 126 delegate()->SetSmartInsertDeleteEnabled(true); | |
| 127 #if defined(OS_WIN) | |
| 128 delegate()->SetSelectTrailingWhitespaceEnabled(true); | |
| 129 #else | |
| 130 delegate()->SetSelectTrailingWhitespaceEnabled(false); | |
| 131 #endif | |
| 132 } | |
| 133 | 122 |
| 134 // Passes options from LayoutTestController through to the delegate (or | 123 // Passes options from LayoutTestController through to the delegate (or |
| 135 // any other caller). | 124 // any other caller). |
| 136 bool ShouldDumpEditingCallbacks() { | 125 bool ShouldDumpEditingCallbacks() { |
| 137 return layout_test_mode_ && | 126 return layout_test_mode_ && |
| 138 layout_test_controller_->ShouldDumpEditingCallbacks(); | 127 layout_test_controller_->ShouldDumpEditingCallbacks(); |
| 139 } | 128 } |
| 140 bool ShouldDumpFrameLoadCallbacks() { | 129 bool ShouldDumpFrameLoadCallbacks() { |
| 141 return layout_test_mode_ && (test_is_preparing_ || test_is_pending_) && | 130 return layout_test_mode_ && (test_is_preparing_ || test_is_pending_) && |
| 142 layout_test_controller_->ShouldDumpFrameLoadCallbacks(); | 131 layout_test_controller_->ShouldDumpFrameLoadCallbacks(); |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 // Dump the stats table counters on exit. | 335 // Dump the stats table counters on exit. |
| 347 bool dump_stats_table_on_exit_; | 336 bool dump_stats_table_on_exit_; |
| 348 | 337 |
| 349 #if defined(OS_LINUX) | 338 #if defined(OS_LINUX) |
| 350 // The height of the non-rendering area of the main window, in pixels. | 339 // The height of the non-rendering area of the main window, in pixels. |
| 351 int top_chrome_height_; | 340 int top_chrome_height_; |
| 352 #endif | 341 #endif |
| 353 }; | 342 }; |
| 354 | 343 |
| 355 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_ | 344 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_ |
| OLD | NEW |