| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 , m_documentSequenceNumber(generateSequenceNumber()) | 50 , m_documentSequenceNumber(generateSequenceNumber()) |
| 51 , m_frameSequenceNumber(generateSequenceNumber()) | 51 , m_frameSequenceNumber(generateSequenceNumber()) |
| 52 , m_scrollRestorationType(ScrollRestorationAuto) | 52 , m_scrollRestorationType(ScrollRestorationAuto) |
| 53 { | 53 { |
| 54 } | 54 } |
| 55 | 55 |
| 56 HistoryItem::~HistoryItem() | 56 HistoryItem::~HistoryItem() |
| 57 { | 57 { |
| 58 } | 58 } |
| 59 | 59 |
| 60 void HistoryItem::generateNewItemSequenceNumber() | |
| 61 { | |
| 62 m_itemSequenceNumber = generateSequenceNumber(); | |
| 63 } | |
| 64 | |
| 65 void HistoryItem::generateNewDocumentSequenceNumber() | |
| 66 { | |
| 67 m_documentSequenceNumber = generateSequenceNumber(); | |
| 68 } | |
| 69 | |
| 70 const String& HistoryItem::urlString() const | 60 const String& HistoryItem::urlString() const |
| 71 { | 61 { |
| 72 return m_urlString; | 62 return m_urlString; |
| 73 } | 63 } |
| 74 | 64 |
| 75 KURL HistoryItem::url() const | 65 KURL HistoryItem::url() const |
| 76 { | 66 { |
| 77 return KURL(ParsedURLString, m_urlString); | 67 return KURL(ParsedURLString, m_urlString); |
| 78 } | 68 } |
| 79 | 69 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 const IntPoint& HistoryItem::scrollPoint() const | 112 const IntPoint& HistoryItem::scrollPoint() const |
| 123 { | 113 { |
| 124 return m_scrollPoint; | 114 return m_scrollPoint; |
| 125 } | 115 } |
| 126 | 116 |
| 127 void HistoryItem::setScrollPoint(const IntPoint& point) | 117 void HistoryItem::setScrollPoint(const IntPoint& point) |
| 128 { | 118 { |
| 129 m_scrollPoint = point; | 119 m_scrollPoint = point; |
| 130 } | 120 } |
| 131 | 121 |
| 132 void HistoryItem::clearScrollPoint() | |
| 133 { | |
| 134 m_scrollPoint = IntPoint(); | |
| 135 m_pinchViewportScrollPoint = FloatPoint(); | |
| 136 } | |
| 137 | |
| 138 float HistoryItem::pageScaleFactor() const | 122 float HistoryItem::pageScaleFactor() const |
| 139 { | 123 { |
| 140 return m_pageScaleFactor; | 124 return m_pageScaleFactor; |
| 141 } | 125 } |
| 142 | 126 |
| 143 void HistoryItem::setPageScaleFactor(float scaleFactor) | 127 void HistoryItem::setPageScaleFactor(float scaleFactor) |
| 144 { | 128 { |
| 145 m_pageScaleFactor = scaleFactor; | 129 m_pageScaleFactor = scaleFactor; |
| 146 } | 130 } |
| 147 | 131 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 // FIXME: We should find a better way to check if this is the current docume
nt. | 201 // FIXME: We should find a better way to check if this is the current docume
nt. |
| 218 return equalIgnoringFragmentIdentifier(url(), doc->url()); | 202 return equalIgnoringFragmentIdentifier(url(), doc->url()); |
| 219 } | 203 } |
| 220 | 204 |
| 221 DEFINE_TRACE(HistoryItem) | 205 DEFINE_TRACE(HistoryItem) |
| 222 { | 206 { |
| 223 visitor->trace(m_documentState); | 207 visitor->trace(m_documentState); |
| 224 } | 208 } |
| 225 | 209 |
| 226 } // namespace blink | 210 } // namespace blink |
| OLD | NEW |