commit d5a27eba08000d62b712149ed5809f91f1eb8ab6
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Thu Nov 5 01:52:53 2020 +0000
Revert "Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware"
This reverts commit 49685688c006f3050f64c091563eded4466ef9ad.
---
.../main/java/org/mozilla/geckoview/WebRequest.java | 18 ------------------
widget/android/WebExecutorSupport.cpp | 10 ----------
2 files changed, 28 deletions(-)
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
index 18f56abeec43..7e3aa285c5be 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
@@ -49,11 +49,6 @@ public class WebRequest extends WebMessage {
*/
public final @Nullable String referrer;
- /**
- * The value of the origin of this request.
- */
- public final @Nullable String origin;
-
@Retention(RetentionPolicy.SOURCE)
@IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE,
CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE,
@@ -115,7 +110,6 @@ public class WebRequest extends WebMessage {
method = builder.mMethod;
cacheMode = builder.mCacheMode;
referrer = builder.mReferrer;
- origin = builder.mOrigin;
if (builder.mBody != null) {
body = builder.mBody.asReadOnlyBuffer();
@@ -132,7 +126,6 @@ public class WebRequest extends WebMessage {
/* package */ String mMethod = "GET";
/* package */ int mCacheMode = CACHE_MODE_DEFAULT;
/* package */ String mReferrer;
- /* package */ String mOrigin;
/**
* Construct a Builder instance with the specified URI.
@@ -212,17 +205,6 @@ public class WebRequest extends WebMessage {
return this;
}
- /**
- * Set the origin URI.
- *
- * @param origin A URI String
- * @return This Builder instance.
- */
- public @NonNull Builder origin(final @Nullable String origin) {
- mOrigin = origin;
- return this;
- }
-
/**
* @return A {@link WebRequest} constructed with the values from this Builder instance.
*/
diff --git a/widget/android/WebExecutorSupport.cpp b/widget/android/WebExecutorSupport.cpp
index bb639740f013..f9f4262fb50c 100644
--- a/widget/android/WebExecutorSupport.cpp
+++ b/widget/android/WebExecutorSupport.cpp
@@ -390,16 +390,6 @@ nsresult WebExecutorSupport::CreateStreamLoader(
MOZ_ASSERT(cookieJarSettings);
nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo();
-
- RefPtr<nsIURI> originUri;
- const auto origin = req->Origin();
- if (origin) {
- rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString());
- NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI);
- OriginAttributes attrs = loadInfo->GetOriginAttributes();
- attrs.SetFirstPartyDomain(true, originUri);
- loadInfo->SetOriginAttributes(attrs);
- }
loadInfo->SetCookieJarSettings(cookieJarSettings);
// setup http/https specific things