| 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 return m_pageScaleFactor; | 122 return m_pageScaleFactor; |
| 123 } | 123 } |
| 124 | 124 |
| 125 void HistoryItem::setPageScaleFactor(float scaleFactor) | 125 void HistoryItem::setPageScaleFactor(float scaleFactor) |
| 126 { | 126 { |
| 127 m_pageScaleFactor = scaleFactor; | 127 m_pageScaleFactor = scaleFactor; |
| 128 } | 128 } |
| 129 | 129 |
| 130 void HistoryItem::setDocumentState(const Vector<String>& state) | 130 void HistoryItem::setDocumentState(const Vector<String>& state) |
| 131 { | 131 { |
| 132 ASSERT(!m_documentState); | 132 DCHECK(!m_documentState); |
| 133 m_documentStateVector = state; | 133 m_documentStateVector = state; |
| 134 } | 134 } |
| 135 | 135 |
| 136 void HistoryItem::setDocumentState(DocumentState* state) | 136 void HistoryItem::setDocumentState(DocumentState* state) |
| 137 { | 137 { |
| 138 m_documentState = state; | 138 m_documentState = state; |
| 139 } | 139 } |
| 140 | 140 |
| 141 const Vector<String>& HistoryItem::documentState() | 141 const Vector<String>& HistoryItem::documentState() |
| 142 { | 142 { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 // FIXME: We should find a better way to check if this is the current docume
nt. | 199 // FIXME: We should find a better way to check if this is the current docume
nt. |
| 200 return equalIgnoringFragmentIdentifier(url(), doc->url()); | 200 return equalIgnoringFragmentIdentifier(url(), doc->url()); |
| 201 } | 201 } |
| 202 | 202 |
| 203 DEFINE_TRACE(HistoryItem) | 203 DEFINE_TRACE(HistoryItem) |
| 204 { | 204 { |
| 205 visitor->trace(m_documentState); | 205 visitor->trace(m_documentState); |
| 206 } | 206 } |
| 207 | 207 |
| 208 } // namespace blink | 208 } // namespace blink |
| OLD | NEW |