| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 void HistoryItem::setReferrer(const Referrer& referrer) { | 78 void HistoryItem::setReferrer(const Referrer& referrer) { |
| 79 // This should be a RELEASE_ASSERT. | 79 // This should be a RELEASE_ASSERT. |
| 80 m_referrer = SecurityPolicy::generateReferrer(referrer.referrerPolicy, url(), | 80 m_referrer = SecurityPolicy::generateReferrer(referrer.referrerPolicy, url(), |
| 81 referrer.referrer); | 81 referrer.referrer); |
| 82 } | 82 } |
| 83 | 83 |
| 84 void HistoryItem::setTarget(const String& target) { | 84 void HistoryItem::setTarget(const String& target) { |
| 85 m_target = target; | 85 m_target = target; |
| 86 } | 86 } |
| 87 | 87 |
| 88 const FloatPoint& HistoryItem::visualViewportScrollPoint() const { | 88 const ScrollOffset& HistoryItem::visualViewportScrollOffset() const { |
| 89 return m_visualViewportScrollPoint; | 89 return m_visualViewportScrollOffset; |
| 90 } | 90 } |
| 91 | 91 |
| 92 void HistoryItem::setVisualViewportScrollPoint(const FloatPoint& point) { | 92 void HistoryItem::setVisualViewportScrollOffset(const ScrollOffset& offset) { |
| 93 m_visualViewportScrollPoint = point; | 93 m_visualViewportScrollOffset = offset; |
| 94 } | 94 } |
| 95 | 95 |
| 96 const IntPoint& HistoryItem::scrollPoint() const { | 96 const ScrollOffset& HistoryItem::scrollOffset() const { |
| 97 return m_scrollPoint; | 97 return m_scrollOffset; |
| 98 } | 98 } |
| 99 | 99 |
| 100 void HistoryItem::setScrollPoint(const IntPoint& point) { | 100 void HistoryItem::setScrollOffset(const ScrollOffset& offset) { |
| 101 m_scrollPoint = point; | 101 m_scrollOffset = offset; |
| 102 } | 102 } |
| 103 | 103 |
| 104 float HistoryItem::pageScaleFactor() const { | 104 float HistoryItem::pageScaleFactor() const { |
| 105 return m_pageScaleFactor; | 105 return m_pageScaleFactor; |
| 106 } | 106 } |
| 107 | 107 |
| 108 void HistoryItem::setPageScaleFactor(float scaleFactor) { | 108 void HistoryItem::setPageScaleFactor(float scaleFactor) { |
| 109 m_pageScaleFactor = scaleFactor; | 109 m_pageScaleFactor = scaleFactor; |
| 110 } | 110 } |
| 111 | 111 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 bool HistoryItem::isCurrentDocument(Document* doc) const { | 168 bool HistoryItem::isCurrentDocument(Document* doc) const { |
| 169 // FIXME: We should find a better way to check if this is the current document
. | 169 // FIXME: We should find a better way to check if this is the current document
. |
| 170 return equalIgnoringFragmentIdentifier(url(), doc->url()); | 170 return equalIgnoringFragmentIdentifier(url(), doc->url()); |
| 171 } | 171 } |
| 172 | 172 |
| 173 DEFINE_TRACE(HistoryItem) { | 173 DEFINE_TRACE(HistoryItem) { |
| 174 visitor->trace(m_documentState); | 174 visitor->trace(m_documentState); |
| 175 } | 175 } |
| 176 | 176 |
| 177 } // namespace blink | 177 } // namespace blink |
| OLD | NEW |