| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 return DocumentLoader::isClientRedirect(); | 92 return DocumentLoader::isClientRedirect(); |
| 93 } | 93 } |
| 94 | 94 |
| 95 bool WebDataSourceImpl::replacesCurrentHistoryItem() const | 95 bool WebDataSourceImpl::replacesCurrentHistoryItem() const |
| 96 { | 96 { |
| 97 return DocumentLoader::replacesCurrentHistoryItem(); | 97 return DocumentLoader::replacesCurrentHistoryItem(); |
| 98 } | 98 } |
| 99 | 99 |
| 100 WebNavigationType WebDataSourceImpl::navigationType() const | 100 WebNavigationType WebDataSourceImpl::navigationType() const |
| 101 { | 101 { |
| 102 return toWebNavigationType(triggeringAction().type()); | 102 return toWebNavigationType(DocumentLoader::navigationType()); |
| 103 } | |
| 104 | |
| 105 double WebDataSourceImpl::triggeringEventTime() const | |
| 106 { | |
| 107 // DOMTimeStamp uses units of milliseconds. | |
| 108 return convertDOMTimeStampToSeconds(triggeringAction().eventTimeStamp()); | |
| 109 } | 103 } |
| 110 | 104 |
| 111 WebDataSource::ExtraData* WebDataSourceImpl::extraData() const | 105 WebDataSource::ExtraData* WebDataSourceImpl::extraData() const |
| 112 { | 106 { |
| 113 return m_extraData.get(); | 107 return m_extraData.get(); |
| 114 } | 108 } |
| 115 | 109 |
| 116 void WebDataSourceImpl::setExtraData(ExtraData* extraData) | 110 void WebDataSourceImpl::setExtraData(ExtraData* extraData) |
| 117 { | 111 { |
| 118 // extraData can't be a PassOwnPtr because setExtraData is a WebKit API func
tion. | 112 // extraData can't be a PassOwnPtr because setExtraData is a WebKit API func
tion. |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 | 156 |
| 163 ASSERT(nextPluginLoadObserver()->url() == WebURL(request.url())); | 157 ASSERT(nextPluginLoadObserver()->url() == WebURL(request.url())); |
| 164 m_pluginLoadObserver = nextPluginLoadObserver().release(); | 158 m_pluginLoadObserver = nextPluginLoadObserver().release(); |
| 165 } | 159 } |
| 166 | 160 |
| 167 WebDataSourceImpl::~WebDataSourceImpl() | 161 WebDataSourceImpl::~WebDataSourceImpl() |
| 168 { | 162 { |
| 169 } | 163 } |
| 170 | 164 |
| 171 } // namespace blink | 165 } // namespace blink |
| OLD | NEW |