diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 09:50:06 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 09:50:06 +0000 |
| commit | f84b727ba862c91bace1aa80ce8dd1c636e2335a (patch) | |
| tree | 130ce78fd754fa3cabfb0ad251264b14eb895724 /content/shell/webkit_test_controller.h | |
| parent | 09ec9f9bad4fceb6cc88461c29f0866d125d174b (diff) | |
| download | chromium_src-f84b727ba862c91bace1aa80ce8dd1c636e2335a.zip chromium_src-f84b727ba862c91bace1aa80ce8dd1c636e2335a.tar.gz chromium_src-f84b727ba862c91bace1aa80ce8dd1c636e2335a.tar.bz2 | |
[content shell] if a layout test runs notifyDone() before it has finished loading, wait for the page to finish loading
BUG=111316
R=marja@chromium.org
Review URL: https://codereview.chromium.org/11594006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/webkit_test_controller.h')
| -rw-r--r-- | content/shell/webkit_test_controller.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h index 9d83849..d8e2601a 100644 --- a/content/shell/webkit_test_controller.h +++ b/content/shell/webkit_test_controller.h @@ -147,6 +147,8 @@ class WebKitTestController : public base::NonThreadSafe, bool is_printing_; bool should_stay_on_page_after_handling_before_unload_; bool wait_until_done_; + bool did_finish_load_; + // TODO(jochen): Once we remove layout tests from content_browsertests, make // this a member instead of a scoped_ptr. scoped_ptr<ShellWebPreferences> prefs_; |