Skip to content

Commit 019900f

Browse files
authored
chore: update browser_patches (#38286)
1 parent 483b722 commit 019900f

File tree

8 files changed

+1434
-1211
lines changed

8 files changed

+1434
-1211
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
REMOTE_URL="https://github.com/mozilla-firefox/firefox"
22
BASE_BRANCH="release"
3-
BASE_REVISION="c1ee0105d25a4c2b2887e916470bdf41a9fd47ef"
3+
BASE_REVISION="e0df3d598dba47de812bb5144cbc187557377095"

browser_patches/firefox/juggler/TargetRegistry.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const Cr = Components.results;
1313
const helper = new Helper();
1414

1515
const IDENTITY_NAME = 'JUGGLER ';
16-
const HUNDRED_YEARS = 1000 * 60 * 60 * 24 * 365 * 100;
16+
const HUNDRED_YEARS = 60 * 60 * 24 * 365 * 100;
1717

1818
const ALL_PERMISSIONS = [
1919
'geo',
@@ -1153,7 +1153,7 @@ class BrowserContext {
11531153
secure,
11541154
cookie.httpOnly || false,
11551155
cookie.expires === undefined || cookie.expires === -1 /* isSession */,
1156-
cookie.expires === undefined ? Date.now() + HUNDRED_YEARS : cookie.expires,
1156+
cookie.expires === undefined ? Date.now() + HUNDRED_YEARS : cookie.expires * 1000,
11571157
{ userContextId: this.userContextId || undefined } /* originAttributes */,
11581158
protocolToSameSite[cookie.sameSite],
11591159
Ci.nsICookie.SCHEME_UNSET
@@ -1183,7 +1183,7 @@ class BrowserContext {
11831183
value: cookie.value,
11841184
domain: cookie.host,
11851185
path: cookie.path,
1186-
expires: cookie.isSession ? -1 : cookie.expiry,
1186+
expires: cookie.isSession ? -1 : cookie.expiry / 1000,
11871187
size: cookie.name.length + cookie.value.length,
11881188
httpOnly: cookie.isHttpOnly,
11891189
secure: cookie.isSecure,

browser_patches/firefox/juggler/content/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function initialize(browsingContext, docShell) {
3131
heading: NaN,
3232
speed: NaN,
3333
},
34-
timestamp: Date.now()
34+
timestamp: Date.now() + 24 * 60 * 60 * 1000, // Make sure it does not expire for a day.
3535
});
3636
} else {
3737
browsingContext.setGeolocationServiceOverride();

browser_patches/firefox/patches/bootstrap.diff

Lines changed: 287 additions & 160 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
REMOTE_URL="https://github.com/WebKit/WebKit.git"
22
BASE_BRANCH="main"
3-
BASE_REVISION="cf7cbd32027884e36fa99df79bcd322925f65e48"
3+
BASE_REVISION="486de399887bc8fa8a69e2f194ebc9476589a08a"

browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@ - (WKWebsiteDataStore *)persistentDataStore
186186
NSURL *cookieFile = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/cookie.db", _userDataDir]];
187187
[configuration _setCookieStorageFile:cookieFile];
188188

189-
NSURL *applicationCacheDirectory = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/ApplicationCache", _userDataDir]];
190-
[configuration setApplicationCacheDirectory:applicationCacheDirectory];
191-
192189
NSURL *cacheStorageDirectory = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/CacheStorage", _userDataDir]];
193190
[configuration _setCacheStorageDirectory:cacheStorageDirectory];
194191

browser_patches/webkit/embedder/Playwright/win/WinMain.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
109109
auto configuration = adoptWK(WKWebsiteDataStoreConfigurationCreate());
110110
if (g_options.userDataDir.length()) {
111111
std::string profileFolder = toUTF8String(g_options.userDataDir, g_options.userDataDir.length());
112-
WKWebsiteDataStoreConfigurationSetApplicationCacheDirectory(configuration.get(), toWK(profileFolder + "\\ApplicationCache").get());
113112
WKWebsiteDataStoreConfigurationSetNetworkCacheDirectory(configuration.get(), toWK(profileFolder + "\\Cache").get());
114113
WKWebsiteDataStoreConfigurationSetCacheStorageDirectory(configuration.get(), toWK(profileFolder + "\\CacheStorage").get());
115114
WKWebsiteDataStoreConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(profileFolder + "\\Databases" + "\\IndexedDB").get());

browser_patches/webkit/patches/bootstrap.diff

Lines changed: 1141 additions & 1041 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)