Chromium Code Reviews

Side by Side Diff: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Julien Chaffraix <jchaffraix@webkit.org> All right reserv ed. 2 * Copyright (C) 2010 Julien Chaffraix <jchaffraix@webkit.org> All right reserv ed.
3 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 109 matching lines...)
120 // the event handler calls xhr.abort()). In such cases a 120 // the event handler calls xhr.abort()). In such cases a
121 // readystatechange should have been already dispatched if necessary. 121 // readystatechange should have been already dispatched if necessary.
122 m_target->dispatchEvent(event); 122 m_target->dispatchEvent(event);
123 } 123 }
124 } 124 }
125 125
126 void XMLHttpRequestProgressEventThrottle::dispatchProgressProgressEvent(PassRefP trWillBeRawPtr<Event> progressEvent) 126 void XMLHttpRequestProgressEventThrottle::dispatchProgressProgressEvent(PassRefP trWillBeRawPtr<Event> progressEvent)
127 { 127 {
128 XMLHttpRequest::State state = m_target->readyState(); 128 XMLHttpRequest::State state = m_target->readyState();
129 if (m_target->readyState() == XMLHttpRequest::LOADING && m_hasDispatchedProg ressProgressEvent) { 129 if (m_target->readyState() == XMLHttpRequest::LOADING && m_hasDispatchedProg ressProgressEvent) {
130 TRACE_EVENT1("devtools.timeline", "XHRReadyStateChange", "data", Inspect orXhrReadyStateChangeEvent::data(m_target->executionContext(), m_target)); 130 TRACE_EVENT1("devtools.timeline", "XHRReadyStateChange", "data", Inspect orXhrReadyStateChangeEvent::data(m_target->getExecutionContext(), m_target));
131 m_target->dispatchEvent(Event::create(EventTypeNames::readystatechange)) ; 131 m_target->dispatchEvent(Event::create(EventTypeNames::readystatechange)) ;
132 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Up dateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::d ata()); 132 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Up dateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::d ata());
133 } 133 }
134 134
135 if (m_target->readyState() != state) 135 if (m_target->readyState() != state)
136 return; 136 return;
137 137
138 m_hasDispatchedProgressProgressEvent = true; 138 m_hasDispatchedProgressProgressEvent = true;
139 m_target->dispatchEvent(progressEvent); 139 m_target->dispatchEvent(progressEvent);
140 } 140 }
(...skipping 27 matching lines...)
168 // event-handler could insert new active DOM objects to the list. 168 // event-handler could insert new active DOM objects to the list.
169 startOneShot(0, BLINK_FROM_HERE); 169 startOneShot(0, BLINK_FROM_HERE);
170 } 170 }
171 171
172 DEFINE_TRACE(XMLHttpRequestProgressEventThrottle) 172 DEFINE_TRACE(XMLHttpRequestProgressEventThrottle)
173 { 173 {
174 visitor->trace(m_target); 174 visitor->trace(m_target);
175 } 175 }
176 176
177 } // namespace blink 177 } // namespace blink
OLDNEW

Powered by Google App Engine