diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 21:46:42 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 21:46:42 +0000 |
| commit | 7e7e2a304b85b93ee97087656684e797ce0db2c2 (patch) | |
| tree | c23c46a5d7df2eff3837815987d827a4261c2eb5 /webkit/tools | |
| parent | d88a55d09669e7f6642af2ed7955095ae1d9730d (diff) | |
| download | chromium_src-7e7e2a304b85b93ee97087656684e797ce0db2c2.zip chromium_src-7e7e2a304b85b93ee97087656684e797ce0db2c2.tar.gz chromium_src-7e7e2a304b85b93ee97087656684e797ce0db2c2.tar.bz2 | |
Fix tests involving multiple windows that log frame load events.
Change test_is_pending_ and test_is_preparing_ to be globals. This
way other windows in the same test can see the same values. Without
this, frame load events that occur in other windows are not logged.
R=dglazkov
BUG=21644
TEST=none
Review URL: http://codereview.chromium.org/204008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 6eeb4a5..44d3a68 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -99,6 +99,8 @@ WindowList* TestShell::window_list_; WebPreferences* TestShell::web_prefs_ = NULL; bool TestShell::layout_test_mode_ = false; int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs; +bool TestShell::test_is_preparing_ = false; +bool TestShell::test_is_pending_ = false; TestShell::TestShell() : m_mainWnd(NULL), @@ -110,8 +112,6 @@ TestShell::TestShell() default_edit_wnd_proc_(0), #endif test_params_(NULL), - test_is_preparing_(false), - test_is_pending_(false), is_modal_(false), dump_stats_table_on_exit_(false) { delegate_.reset(new TestWebViewDelegate(this)); diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h index 5d14c55..7518cec 100644 --- a/webkit/tools/test_shell/test_shell.h +++ b/webkit/tools/test_shell/test_shell.h @@ -335,10 +335,10 @@ private: const TestParams* test_params_; // True while a test is preparing to run - bool test_is_preparing_; + static bool test_is_preparing_; // True while a test is running - bool test_is_pending_; + static bool test_is_pending_; // True if driven from a nested message loop. bool is_modal_; |