Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: Source/web/WebDataSourceImpl.cpp

Issue 206453010: NavigationAction should not retain Event. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/NavigationAction.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 return DocumentLoader::replacesCurrentHistoryItem(); 99 return DocumentLoader::replacesCurrentHistoryItem();
100 } 100 }
101 101
102 WebNavigationType WebDataSourceImpl::navigationType() const 102 WebNavigationType WebDataSourceImpl::navigationType() const
103 { 103 {
104 return toWebNavigationType(triggeringAction().type()); 104 return toWebNavigationType(triggeringAction().type());
105 } 105 }
106 106
107 double WebDataSourceImpl::triggeringEventTime() const 107 double WebDataSourceImpl::triggeringEventTime() const
108 { 108 {
109 if (!triggeringAction().event())
110 return 0.0;
111
112 // DOMTimeStamp uses units of milliseconds. 109 // DOMTimeStamp uses units of milliseconds.
113 return convertDOMTimeStampToSeconds(triggeringAction().event()->timeStamp()) ; 110 return convertDOMTimeStampToSeconds(triggeringAction().eventTimeStamp());
114 } 111 }
115 112
116 WebDataSource::ExtraData* WebDataSourceImpl::extraData() const 113 WebDataSource::ExtraData* WebDataSourceImpl::extraData() const
117 { 114 {
118 return m_extraData.get(); 115 return m_extraData.get();
119 } 116 }
120 117
121 void WebDataSourceImpl::setExtraData(ExtraData* extraData) 118 void WebDataSourceImpl::setExtraData(ExtraData* extraData)
122 { 119 {
123 // extraData can't be a PassOwnPtr because setExtraData is a WebKit API func tion. 120 // 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
167 164
168 ASSERT(nextPluginLoadObserver()->url() == WebURL(request.url())); 165 ASSERT(nextPluginLoadObserver()->url() == WebURL(request.url()));
169 m_pluginLoadObserver = nextPluginLoadObserver().release(); 166 m_pluginLoadObserver = nextPluginLoadObserver().release();
170 } 167 }
171 168
172 WebDataSourceImpl::~WebDataSourceImpl() 169 WebDataSourceImpl::~WebDataSourceImpl()
173 { 170 {
174 } 171 }
175 172
176 } // namespace blink 173 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/NavigationAction.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698