OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/test/chromedriver/navigation_tracker.h" | 5 #include "chrome/test/chromedriver/navigation_tracker.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/test/chromedriver/devtools_client.h" | 10 #include "chrome/test/chromedriver/devtools_client.h" |
11 #include "chrome/test/chromedriver/status.h" | 11 #include "chrome/test/chromedriver/status.h" |
12 | 12 |
13 NavigationTracker::NavigationTracker(DevToolsClient* client) : client_(client) { | 13 NavigationTracker::NavigationTracker(DevToolsClient* client) : client_(client) { |
14 DCHECK(client_); | 14 DCHECK(client_); |
15 client_->AddListener(this); | 15 client_->AddListener(this); |
16 } | 16 } |
17 | 17 |
18 NavigationTracker::~NavigationTracker() {} | 18 NavigationTracker::~NavigationTracker() {} |
19 | 19 |
20 bool NavigationTracker::IsPendingNavigation(const std::string& frame_id) { | 20 bool NavigationTracker::IsPendingNavigation(const std::string& frame_id) { |
21 return frame_state_[frame_id].IsPendingNavigation(); | 21 return frame_state_[frame_id].IsPendingNavigation(); |
22 } | 22 } |
23 | 23 |
24 Status NavigationTracker::OnConnected() { | 24 Status NavigationTracker::OnConnected() { |
| 25 frame_state_.clear(); |
25 // Enable page domain notifications to allow tracking navigation state. | 26 // Enable page domain notifications to allow tracking navigation state. |
26 base::DictionaryValue params; | 27 base::DictionaryValue params; |
27 return client_->SendCommand("Page.enable", params); | 28 return client_->SendCommand("Page.enable", params); |
28 } | 29 } |
29 | 30 |
30 void NavigationTracker::OnEvent(const std::string& method, | 31 void NavigationTracker::OnEvent(const std::string& method, |
31 const base::DictionaryValue& params) { | 32 const base::DictionaryValue& params) { |
32 if (method == "Page.frameStartedLoading" || | 33 if (method == "Page.frameStartedLoading" || |
33 method == "Page.frameStoppedLoading" || | 34 method == "Page.frameStoppedLoading" || |
34 method == "Page.frameScheduledNavigation" || | 35 method == "Page.frameScheduledNavigation" || |
(...skipping 23 matching lines...) Expand all Loading... |
58 return (state_bitfield_ & (LOADING | SCHEDULED)) != 0; | 59 return (state_bitfield_ & (LOADING | SCHEDULED)) != 0; |
59 } | 60 } |
60 | 61 |
61 void NavigationTracker::NavigationState::SetFlags(const Mask mask) { | 62 void NavigationTracker::NavigationState::SetFlags(const Mask mask) { |
62 state_bitfield_ |= mask; | 63 state_bitfield_ |= mask; |
63 } | 64 } |
64 | 65 |
65 void NavigationTracker::NavigationState::ClearFlags(const Mask mask) { | 66 void NavigationTracker::NavigationState::ClearFlags(const Mask mask) { |
66 state_bitfield_ &= ~mask; | 67 state_bitfield_ &= ~mask; |
67 } | 68 } |
OLD | NEW |