diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index a8bb90c2649..cc1adf7f39d 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index a0ee9c56b8fa095e579831c525a78e422c426fe5..446d4d13a12450592247e8046bc0546e8e013bf6 100644 +index 2c31798435d89bdd0751401010c8d893773daad9..a0dae53f6894261cebd1fbc5d0d211cbcd51ebaa 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=105 -MINOR=0 --BUILD=5176 --PATCH=3 +-BUILD=5191 +-PATCH=0 +MINOR=1 +BUILD=44 +PATCH=62 diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch index 435f5a07825..511549d539c 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch @@ -1,9 +1,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -index 137c7cdb1a4d61badc80c53c3071402dc56b74d9..a42bbd6f20517935e537c5d3d22fbc7e98ded6f3 100644 +index 74353ecb4143cf901e69e242d8663e8d12e90e69..353936037b7e636ab9a3dbef0c4198edb5c368e2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -400,7 +400,7 @@ public abstract class ChromeActivity - private Callback mSelectionPopupBackPressInitCallback; +@@ -402,7 +402,7 @@ public abstract class ChromeActivity + private StylusWritingCoordinator mStylusWritingCoordinator; protected ChromeActivity() { - mIntentHandler = new IntentHandler(this, createIntentHandlerDelegate()); diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index 9c12f91cf27..bf403cbed01 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index 8ee5246d5c581baa85d9183ad80f4795b4bc2636..a08f87e24bd1ca51df7b348cca95b365f03164c6 100644 +index 45f05e78f2e41b49c1194e64952c58958542750e..dbb8e40f0ed48338ca8f04ae251654c427b680c4 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -@@ -430,6 +430,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -432,6 +432,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC if (mOptionalButton != null) { mOptionalButton.setBackgroundColorFilter(color); } @@ -26,15 +26,15 @@ index 8ee5246d5c581baa85d9183ad80f4795b4bc2636..a08f87e24bd1ca51df7b348cca95b365 if (mStartSurfaceScrollFraction == 1.0f) return mToolbarSidePadding; return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getWidth()); -@@ -973,6 +976,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -998,6 +1001,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC * New Tab Page. */ private void updateLocationBarLayoutForExpansionAnimation() { + if (!BraveToolbarLayout.class.cast(this).isLocationBarValid(mLocationBar)) return; TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation"); - FrameLayout.LayoutParams locationBarLayoutParams = - mLocationBar.getPhoneCoordinator().getFrameLayoutParams(); -@@ -2103,6 +2107,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC + if (mOptimizationsEnabled && isInTabSwitcherMode()) return; + +@@ -2138,6 +2142,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-installer-mini_installer-chrome.release.patch b/patches/chrome-installer-mini_installer-chrome.release.patch index 8cbaeffb9eb..29bc28ebec3 100644 --- a/patches/chrome-installer-mini_installer-chrome.release.patch +++ b/patches/chrome-installer-mini_installer-chrome.release.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release -index 5cdaad05767053cf4327e7edf8c47adf473c31f2..4f3bfdc2eb7da65d778adb92225a05c9ec97be87 100644 +index 50e7498203d8ff466197d745b04b66c20cff0cc8..c4a613e87eb9394bc7f23b1ae4da607a15eb2443 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -6,7 +6,7 @@ @@ -25,8 +25,8 @@ index 5cdaad05767053cf4327e7edf8c47adf473c31f2..4f3bfdc2eb7da65d778adb92225a05c9 +chrome_child.dll.sig: %(VersionDir)s\ chrome_elf.dll: %(VersionDir)s\ chrome_pwa_launcher.exe: %(VersionDir)s\ - d3dcompiler_47.dll: %(VersionDir)s\ -@@ -62,6 +67,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ + chrome_wer.dll: %(VersionDir)s\ +@@ -63,6 +68,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ [HIDPI] chrome_200_percent.pak: %(VersionDir)s\ diff --git a/patches/content-public-browser-content_browser_client.cc.patch b/patches/content-public-browser-content_browser_client.cc.patch deleted file mode 100644 index 5a41cf69373..00000000000 --- a/patches/content-public-browser-content_browser_client.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index b4e2e5d8a5e962a59ba1898217c0b4a679c9242c..e3416de7df907d55407113c70b21e206e6ba63ec 100644 ---- a/content/public/browser/content_browser_client.cc -+++ b/content/public/browser/content_browser_client.cc -@@ -9,7 +9,7 @@ - // declarations instead of including more headers. If that is infeasible, adjust - // the limit. For more info, see - // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md --#pragma clang max_tokens_here 1050000 -+#pragma clang max_tokens_here 1055000 - - #include - diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch index a20aaa63e13..4ad8765f1bf 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl -index 34e7bbadb132f2c411764a00c6ae7ddb0e94fb74..1b7090bb928129b6ef8b80d542b62c42f46bed73 100644 +index 5cbe19cc34e9e42fdb5c044695b3b26b61692f46..f9c33f022efe1cad076fd0fe3cc3e3f8f7671342 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl @@ -112,9 +112,13 @@ interface CanvasRenderingContext2D { @@ -19,11 +19,11 @@ index 34e7bbadb132f2c411764a00c6ae7ddb0e94fb74..1b7090bb928129b6ef8b80d542b62c42 @@ -134,8 +138,8 @@ interface CanvasRenderingContext2D { [RaisesException] ImageData createImageData(ImageData imagedata); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh); - [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); + [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); - [RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh); -- [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); +- [RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); + [CallWith=ScriptState, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh); -+ [CallWith=ScriptState, RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); ++ [CallWith=ScriptState, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy); [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy, [EnforceRange] long dirtyX, [EnforceRange] long dirtyY, [EnforceRange] long dirtyWidth, [EnforceRange] long dirtyHeight); diff --git a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch index 49f2b732e45..72884dc460b 100644 --- a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl -index 42badc9beabd2d22198ec770f4d55c38d97c26ec..a4f04bb818a8e35d520ef3888e478c49d42e6eb7 100644 +index 7e409b3c37a95e6b6950d4d760c9ce953aeb49d8..d701aa22dd69a0722344dc9c39e7edaf6c982585 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl @@ -68,10 +68,16 @@ @@ -22,13 +22,13 @@ index 42badc9beabd2d22198ec770f4d55c38d97c26ec..a4f04bb818a8e35d520ef3888e478c49 @@ -87,8 +93,12 @@ [RaisesException] ImageData createImageData(ImageData imagedata); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh); - [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); + [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); + /* [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh); - [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); + [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); + */ + [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh); -+ [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); ++ [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy); [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy, [EnforceRange] long dirtyX, [EnforceRange] long dirtyY, [EnforceRange] long dirtyWidth, [EnforceRange] long dirtyHeight);