Revert of Add DidSaveScrollOrScaleState flag to prevent restoreScrollPosition...

third_party/WebKit/Source/core/loader/HistoryItem.h

 /*
  * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 41 matching lines @@
   ~HistoryItem();
 
   const String& UrlString() const;
   KURL Url() const;
 
   const Referrer& GetReferrer() const;
 
   EncodedFormData* FormData();
   const AtomicString& FormContentType() const;
 
-  void SetDidSaveScrollOrScaleState(bool did_save_scroll_or_scale_state) {
-    did_save_scroll_or_scale_state_ = did_save_scroll_or_scale_state;
-  }
-
-  bool DidSaveScrollOrScaleState() const {
-    return did_save_scroll_or_scale_state_;
-  }
-
   const ScrollOffset& VisualViewportScrollOffset() const;
   void SetVisualViewportScrollOffset(const ScrollOffset&);
   const ScrollOffset& GetScrollOffset() const;
   void SetScrollOffset(const ScrollOffset&);
 
   float PageScaleFactor() const;
   void SetPageScaleFactor(float);
 
   Vector<String> GetReferencedFilePaths();
   const Vector<String>& GetDocumentState();
@@ skipping 32 matching lines @@
   ResourceRequest GenerateResourceRequest(WebCachePolicy);
 
   DECLARE_TRACE();
 
  private:
   HistoryItem();
 
   String url_string_;
   Referrer referrer_;
 
-  bool did_save_scroll_or_scale_state_;
   ScrollOffset visual_viewport_scroll_offset_;
   ScrollOffset scroll_offset_;
   float page_scale_factor_;
   Vector<String> document_state_vector_;
   Member<DocumentState> document_state_;
 
   // If two HistoryItems have the same item sequence number, then they are
   // clones of one another. Traversing history from one such HistoryItem to
   // another is a no-op. HistoryItem clones are created for parent and
   // sibling frames when only a subframe navigates.
@@ skipping 12 matching lines @@
   RefPtr<SerializedScriptValue> state_object_;
 
   // info used to repost form data
   RefPtr<EncodedFormData> form_data_;
   AtomicString form_content_type_;
 };  // class HistoryItem
 
 }  // namespace blink
 
 #endif  // HISTORYITEM_H