Source/core/xml/XMLHttpRequest.h - Issue 23465030: Prevent entering XHR methods while loader is being cancelled.

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: Source/core/xml/XMLHttpRequest.h

Issue 23465030: Prevent entering XHR methods while loader is being cancelled. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 3 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

« no previous file with comments | « LayoutTests/http/tests/xmlhttprequest/reentrant-cancel-expected.txt ('k') | Source/core/xml/XMLHttpRequest.cpp » ('j') | Source/core/xml/XMLHttpRequest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/xml/XMLHttpRequest.h

diff --git a/Source/core/xml/XMLHttpRequest.h b/Source/core/xml/XMLHttpRequest.h

index ca6f9211aeeb07be634b914336dc4b8f47c2ae12..1f1a89e7201e75e1034a26c8066c9f113fae708d 100644

--- a/Source/core/xml/XMLHttpRequest.h

+++ b/Source/core/xml/XMLHttpRequest.h

@@ -109,7 +109,7 @@ public:

void send(DOMFormData*, ExceptionState&);

void send(ArrayBuffer*, ExceptionState&);

void send(ArrayBufferView*, ExceptionState&);

- void abort();

+ void abort(ExceptionState&);

void setRequestHeader(const AtomicString& name, const String& value, ExceptionState&);

void overrideMimeType(const String& override);

String getAllResponseHeaders(ExceptionState&) const;

@@ -216,6 +216,9 @@ private:

RefPtr<SharedBuffer> m_binaryResponseBuilder;

mutable RefPtr<ArrayBuffer> m_responseArrayBuffer;

+ // Prevents reentrant of methods while m_loader->cancel() is running.

+ bool m_preventReentrant;

bool m_error;

bool m_uploadEventsAllowed;