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

Unified Diff: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h

Issue 2646733003: XMLHttpRequest: Don't use nullness of isolatedWorldSecurityOrigin to determine whether or not it's … (Closed)
Patch Set: Rebase Created 3 years, 11 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 | « no previous file | third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h
index 0ee3744aa0a4946ae24edae987df70454d47dd46..6ce72dc64cf16dd5687346310d4ae2c3e0dd4d40 100644
--- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h
+++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h
@@ -171,9 +171,15 @@ class XMLHttpRequest final : public XMLHttpRequestEventTarget,
private:
class BlobLoader;
- XMLHttpRequest(ExecutionContext*, PassRefPtr<SecurityOrigin>);
+ XMLHttpRequest(ExecutionContext*,
+ bool isIsolatedWorld,
+ PassRefPtr<SecurityOrigin>);
Document* document() const;
+
+ // Returns the SecurityOrigin of the isolated world if the XMLHttpRequest was
+ // created in an isolated world. Otherwise, returns the SecurityOrigin of the
+ // execution context.
SecurityOrigin* getSecurityOrigin() const;
void didSendData(unsigned long long bytesSent,
@@ -317,6 +323,10 @@ class XMLHttpRequest final : public XMLHttpRequestEventTarget,
// An enum corresponding to the allowed string values for the responseType
// attribute.
ResponseTypeCode m_responseTypeCode;
+
+ // Set to true if the XMLHttpRequest was created in an isolated world.
+ bool m_isIsolatedWorld;
+ // Stores the SecurityOrigin associated with the isolated world if any.
RefPtr<SecurityOrigin> m_isolatedWorldSecurityOrigin;
// This blob loader will be used if |m_downloadingToFile| is true and
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698