summaryrefslogtreecommitdiffstats
path: root/chrome/test/chromedriver
diff options
context:
space:
mode:
authorsamuong <samuong@chromium.org>2015-07-29 13:29:37 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-29 20:30:42 +0000
commitfbeb33cef9de204942d912bf93bfc4d39c7ff86d (patch)
treed1ae92eb308e1c783953d90588d79d5dfddc5483 /chrome/test/chromedriver
parent4f6de07839667b74f379e183e0c95f3d424b8c71 (diff)
downloadchromium_src-fbeb33cef9de204942d912bf93bfc4d39c7ff86d.zip
chromium_src-fbeb33cef9de204942d912bf93bfc4d39c7ff86d.tar.gz
chromium_src-fbeb33cef9de204942d912bf93bfc4d39c7ff86d.tar.bz2
[chromedriver] Explicitly set page loading state when document.readyState != "complete".
BUG=chromedriver:1158 Review URL: https://codereview.chromium.org/1262243002 Cr-Commit-Position: refs/heads/master@{#340965}
Diffstat (limited to 'chrome/test/chromedriver')
-rw-r--r--chrome/test/chromedriver/chrome/navigation_tracker.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/chromedriver/chrome/navigation_tracker.cc b/chrome/test/chromedriver/chrome/navigation_tracker.cc
index 2d37fb5..3aad77b 100644
--- a/chrome/test/chromedriver/chrome/navigation_tracker.cc
+++ b/chrome/test/chromedriver/chrome/navigation_tracker.cc
@@ -53,8 +53,7 @@ Status NavigationTracker::IsPendingNavigation(const std::string& frame_id,
std::string ready_state;
if (status.IsError() || !result->GetString("result.value", &ready_state))
return status;
- if (ready_state == "complete")
- loading_state_ = kNotLoading;
+ loading_state_ = ready_state == "complete" ? kNotLoading : kLoading;
} else {
if (loading_state_ == kUnknown) {
scoped_ptr<base::DictionaryValue> result;