Skip to content

Commit

Permalink
browser(webkit): roll to 12-16 (#4739)
Browse files Browse the repository at this point in the history
  • Loading branch information
yury-s committed Dec 16, 2020
1 parent 23a6e4d commit b014fa1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions browser_patches/webkit/BUILD_NUMBER
@@ -1,2 +1,2 @@
1404
Changed: yurys@chromium.org Tue Dec 15 23:04:18 PST 2020
1405
Changed: yurys@chromium.org Wed 16 Dec 2020 09:16:58 AM PST
2 changes: 1 addition & 1 deletion browser_patches/webkit/UPSTREAM_CONFIG.sh
@@ -1,3 +1,3 @@
REMOTE_URL="https://git.webkit.org/git/WebKit.git"
BASE_BRANCH="master"
BASE_REVISION="b74d2619a5effc533608fccb6f8f7efe2f873a45"
BASE_REVISION="f7bb64cc2ddbfef0d86689671f1ff7b914d3f462"
4 changes: 2 additions & 2 deletions browser_patches/webkit/patches/bootstrap.diff
Expand Up @@ -1591,7 +1591,7 @@ index 9a5c568f780007163a05d9d741d5a47f0d6c38c0..087af58713d3b1e880a64f472a3d6d2a
InspectorWindowFrame:
type: String
diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml
index 88d28e27d998ba4602f3cc3bd6ed9338869689c9..422ea4e602f2a2532c8489cffbec8db30b50afd6 100644
index 5a217a99584e3977ddc9710de45e41728cac60a9..ed49f4da40f90ab9104fe72b9da534402b2f0c78 100644
--- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml
+++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml
@@ -521,7 +521,7 @@ MaskWebGLStringsEnabled:
Expand Down Expand Up @@ -1760,7 +1760,7 @@ index f0049d8221462f419f6887d03fcc41905af2d560..1c4f52105a1f6c46488c76ef58c387fa

#if !defined(ENABLE_TOUCH_ACTION_REGIONS)
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
index a80bd11a6e3e60cac26da023ede7641510e64889..a909118d5c32654e03d12600b328226c9928f1ce 100644
index 6bb786f6ae4984e46255bcab162ab955050dd6ca..38a52e5f171a31c1db0e12fa17c557f4c00a72a3 100644
--- a/Source/WTF/wtf/PlatformHave.h
+++ b/Source/WTF/wtf/PlatformHave.h
@@ -335,7 +335,7 @@
Expand Down

0 comments on commit b014fa1

Please sign in to comment.