| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved. | 2  * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved. | 
| 3  * Copyright (C) 2012 Research In Motion Limited. All rights reserved. | 3  * Copyright (C) 2012 Research In Motion Limited. All rights reserved. | 
| 4  * | 4  * | 
| 5  * Redistribution and use in source and binary forms, with or without | 5  * Redistribution and use in source and binary forms, with or without | 
| 6  * modification, are permitted provided that the following conditions | 6  * modification, are permitted provided that the following conditions | 
| 7  * are met: | 7  * are met: | 
| 8  * 1. Redistributions of source code must retain the above copyright | 8  * 1. Redistributions of source code must retain the above copyright | 
| 9  *    notice, this list of conditions and the following disclaimer. | 9  *    notice, this list of conditions and the following disclaimer. | 
| 10  * 2. Redistributions in binary form must reproduce the above copyright | 10  * 2. Redistributions in binary form must reproduce the above copyright | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 32 #include "core/loader/FrameLoaderTypes.h" | 32 #include "core/loader/FrameLoaderTypes.h" | 
| 33 #include "platform/geometry/FloatPoint.h" | 33 #include "platform/geometry/FloatPoint.h" | 
| 34 #include "platform/geometry/IntPoint.h" | 34 #include "platform/geometry/IntPoint.h" | 
| 35 #include "platform/heap/Handle.h" | 35 #include "platform/heap/Handle.h" | 
| 36 #include "platform/scroll/ScrollTypes.h" | 36 #include "platform/scroll/ScrollTypes.h" | 
| 37 #include "platform/weborigin/Referrer.h" | 37 #include "platform/weborigin/Referrer.h" | 
| 38 #include "wtf/text/WTFString.h" | 38 #include "wtf/text/WTFString.h" | 
| 39 | 39 | 
| 40 namespace blink { | 40 namespace blink { | 
| 41 | 41 | 
| 42 class Document; |  | 
| 43 class DocumentState; | 42 class DocumentState; | 
| 44 class EncodedFormData; | 43 class EncodedFormData; | 
| 45 class KURL; | 44 class KURL; | 
| 46 class ResourceRequest; | 45 class ResourceRequest; | 
|  | 46 enum class WebCachePolicy; | 
| 47 | 47 | 
| 48 class CORE_EXPORT HistoryItem final | 48 class CORE_EXPORT HistoryItem final | 
| 49     : public GarbageCollectedFinalized<HistoryItem> { | 49     : public GarbageCollectedFinalized<HistoryItem> { | 
| 50  public: | 50  public: | 
| 51   static HistoryItem* create() { return new HistoryItem; } | 51   static HistoryItem* create() { return new HistoryItem; } | 
| 52   ~HistoryItem(); | 52   ~HistoryItem(); | 
| 53 | 53 | 
| 54   const String& urlString() const; | 54   const String& urlString() const; | 
| 55   KURL url() const; | 55   KURL url() const; | 
| 56 | 56 | 
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 100     m_scrollRestorationType = type; | 100     m_scrollRestorationType = type; | 
| 101   } | 101   } | 
| 102   HistoryScrollRestorationType scrollRestorationType() { | 102   HistoryScrollRestorationType scrollRestorationType() { | 
| 103     return m_scrollRestorationType; | 103     return m_scrollRestorationType; | 
| 104   } | 104   } | 
| 105 | 105 | 
| 106   void setFormInfoFromRequest(const ResourceRequest&); | 106   void setFormInfoFromRequest(const ResourceRequest&); | 
| 107   void setFormData(PassRefPtr<EncodedFormData>); | 107   void setFormData(PassRefPtr<EncodedFormData>); | 
| 108   void setFormContentType(const AtomicString&); | 108   void setFormContentType(const AtomicString&); | 
| 109 | 109 | 
| 110   bool isCurrentDocument(Document*) const; | 110   ResourceRequest generateResourceRequest(WebCachePolicy); | 
| 111 | 111 | 
| 112   DECLARE_TRACE(); | 112   DECLARE_TRACE(); | 
| 113 | 113 | 
| 114  private: | 114  private: | 
| 115   HistoryItem(); | 115   HistoryItem(); | 
| 116 | 116 | 
| 117   String m_urlString; | 117   String m_urlString; | 
| 118   Referrer m_referrer; | 118   Referrer m_referrer; | 
| 119 | 119 | 
| 120   bool m_didSaveScrollOrScaleState; | 120   bool m_didSaveScrollOrScaleState; | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 143   RefPtr<SerializedScriptValue> m_stateObject; | 143   RefPtr<SerializedScriptValue> m_stateObject; | 
| 144 | 144 | 
| 145   // info used to repost form data | 145   // info used to repost form data | 
| 146   RefPtr<EncodedFormData> m_formData; | 146   RefPtr<EncodedFormData> m_formData; | 
| 147   AtomicString m_formContentType; | 147   AtomicString m_formContentType; | 
| 148 };  // class HistoryItem | 148 };  // class HistoryItem | 
| 149 | 149 | 
| 150 }  // namespace blink | 150 }  // namespace blink | 
| 151 | 151 | 
| 152 #endif  // HISTORYITEM_H | 152 #endif  // HISTORYITEM_H | 
| OLD | NEW | 
|---|