Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 2fa1abdb678e70cd6726fb6208b72683cd226d2f..e3d331ac9f722a1b83e5acdd993ec16c0d8454d0 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -81,6 +81,7 @@ |
#include "content/common/input/web_input_event_traits.h" |
#include "content/common/input_messages.h" |
#include "content/common/page_messages.h" |
+#include "content/common/page_state_serialization.h" |
#include "content/common/site_isolation_policy.h" |
#include "content/common/ssl_status_serialization.h" |
#include "content/common/view_messages.h" |
@@ -4534,6 +4535,22 @@ void WebContentsImpl::UpdateStateForFrame(RenderFrameHost* render_frame_host, |
base::debug::DumpWithoutCrashing(); |
NOTREACHED() << "Shouldn't set an empty PageState."; |
} |
+ |
+ // The document_sequence_number and item_sequence_number recorded in the |
+ // FrameNavigationEntry should not differ from the one coming with the update, |
+ // since it must come from the same document. Do not update it if a difference |
+ // is detected, as this indicates that |frame_entry| is not the correct one. |
+ ExplodedPageState exploded_state; |
+ if (!DecodePageState(page_state.ToEncodedData(), &exploded_state)) |
+ return; |
+ |
+ if (exploded_state.top.document_sequence_number != |
+ frame_entry->document_sequence_number() || |
+ exploded_state.top.item_sequence_number != |
+ frame_entry->item_sequence_number()) { |
+ return; |
+ } |
+ |
frame_entry->set_page_state(page_state); |
controller_.NotifyEntryChanged(entry); |
} |