third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp - Issue 2746333002: DevTools: move recurring flag into AsyncTask, control cancelation from embedder only.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp

Issue 2746333002: DevTools: move recurring flag into AsyncTask, control cancelation from embedder only. (Closed)

Patch Set: Created 3 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 side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp ('K') | « third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestProgressEventThrottle.cpp ('k') | third_party/WebKit/Source/devtools/front_end/perf_ui/FlameChart.js » ('j') | third_party/WebKit/Source/devtools/front_end/perf_ui/FlameChart.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp

diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp

index 18229231dd7659f8013f0480cb231afec923cdb9..48ae50615d4c43bc7941378320d66cd6cd69beac 100644

--- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp

+++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.cpp

@@ -52,7 +52,8 @@ void XMLHttpRequestUpload::dispatchProgressEvent(

m_lastBytesSent = bytesSent;

m_lastTotalBytesToBeSent = totalBytesToBeSent;

probe::AsyncTask asyncTask(getExecutionContext(), m_xmlHttpRequest,

- m_xmlHttpRequest->isAsync());

+ "progress");

+ asyncTask.setEnabled(m_xmlHttpRequest->isAsync());

dispatchEvent(ProgressEvent::create(EventTypeNames::progress, true, bytesSent,

totalBytesToBeSent));

}

@@ -63,8 +64,8 @@ void XMLHttpRequestUpload::dispatchEventAndLoadEnd(const AtomicString& type,

unsigned long long total) {

DCHECK(type == EventTypeNames::load || type == EventTypeNames::abort ||

type == EventTypeNames::error || type == EventTypeNames::timeout);

- probe::AsyncTask asyncTask(getExecutionContext(), m_xmlHttpRequest,

- m_xmlHttpRequest->isAsync());

+ probe::AsyncTask asyncTask(getExecutionContext(), m_xmlHttpRequest, "event");

+ asyncTask.setEnabled(m_xmlHttpRequest->isAsync());

dispatchEvent(

ProgressEvent::create(type, lengthComputable, bytesSent, total));

dispatchEvent(ProgressEvent::create(EventTypeNames::loadend, lengthComputable,

@@ -74,8 +75,8 @@ void XMLHttpRequestUpload::dispatchEventAndLoadEnd(const AtomicString& type,

void XMLHttpRequestUpload::handleRequestError(const AtomicString& type) {

bool lengthComputable = m_lastTotalBytesToBeSent > 0 &&

m_lastBytesSent <= m_lastTotalBytesToBeSent;

- probe::AsyncTask asyncTask(getExecutionContext(), m_xmlHttpRequest,

- m_xmlHttpRequest->isAsync());

+ probe::AsyncTask asyncTask(getExecutionContext(), m_xmlHttpRequest, "error");

+ asyncTask.setEnabled(m_xmlHttpRequest->isAsync());

dispatchEvent(ProgressEvent::create(EventTypeNames::progress,

lengthComputable, m_lastBytesSent,

m_lastTotalBytesToBeSent));