Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1020)

Unified Diff: chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

Issue 13929020: Artifically delay the load finished signal until after dom content loaded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
index 361405fea0339705928b29d42bd7b95d2f48fff7..11bcb5a004f6ca1a5031a9c04992702a6f194201 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
@@ -105,6 +105,7 @@ void FrameNavigationState::TrackFrame(FrameID frame_id,
frame_state.is_navigating = true;
frame_state.is_committed = false;
frame_state.is_server_redirected = false;
+ frame_state.is_parsing = true;
if (!is_main_frame) {
frame_state.parent_frame_num = parent_frame_id.frame_num;
} else {
@@ -229,6 +230,18 @@ bool FrameNavigationState::GetNavigationCompleted(FrameID frame_id) const {
!frame_state->second.is_navigating);
}
+void FrameNavigationState::SetParsingFinished(FrameID frame_id) {
+ DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end());
+ frame_state_map_[frame_id].is_parsing = false;
+}
+
+bool FrameNavigationState::GetParsingFinished(FrameID frame_id) const {
+ FrameIdToStateMap::const_iterator frame_state =
+ frame_state_map_.find(frame_id);
+ return (frame_state == frame_state_map_.end() ||
+ !frame_state->second.is_parsing);
+}
+
void FrameNavigationState::SetNavigationCommitted(FrameID frame_id) {
DCHECK(frame_state_map_.find(frame_id) != frame_state_map_.end());
frame_state_map_[frame_id].is_committed = true;

Powered by Google App Engine
This is Rietveld 408576698