forked from bromite/bromite
-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rebase to v132
- Loading branch information
Showing
219 changed files
with
3,041 additions
and
2,662 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
131.0.6778.205 | ||
132.0.6834.83 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i | |
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json | ||
--- a/chrome/browser/flag-metadata.json | ||
+++ b/chrome/browser/flag-metadata.json | ||
@@ -3408,6 +3408,10 @@ | ||
@@ -3290,6 +3290,10 @@ | ||
"name": "enable-identity-in-auth-error", | ||
"owners": [ "[email protected]", "[email protected]" ], | ||
"expiry_milestone": 135 | ||
|
@@ -145,7 +145,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis | |
diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc | ||
--- a/gpu/config/gpu_finch_features.cc | ||
+++ b/gpu/config/gpu_finch_features.cc | ||
@@ -53,6 +53,11 @@ BASE_FEATURE(kUseGles2ForOopR, | ||
@@ -59,6 +59,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits, | ||
base::FEATURE_DISABLED_BY_DEFAULT); | ||
|
||
#if BUILDFLAG(IS_ANDROID) | ||
|
@@ -160,9 +160,9 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc | |
diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h | ||
--- a/gpu/config/gpu_finch_features.h | ||
+++ b/gpu/config/gpu_finch_features.h | ||
@@ -24,6 +24,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR); | ||
// All features in alphabetical order. The features should be documented | ||
// alongside the definition of their values in the .cc file. | ||
@@ -26,6 +26,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR); | ||
GPU_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits); | ||
|
||
#if BUILDFLAG(IS_ANDROID) | ||
+GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer); | ||
GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl); | ||
|
@@ -171,7 +171,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h | |
diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc | ||
--- a/gpu/config/gpu_util.cc | ||
+++ b/gpu/config/gpu_util.cc | ||
@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( | ||
@@ -125,6 +125,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus( | ||
#if !BUILDFLAG(IS_ANDROID) | ||
return kGpuFeatureStatusDisabled; | ||
#else | ||
|
@@ -181,7 +181,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc | |
if (!gpu_preferences.enable_android_surface_control) | ||
return kGpuFeatureStatusDisabled; | ||
|
||
@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info, | ||
@@ -378,6 +381,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info, | ||
kGpuFeatureStatusSoftware; | ||
} | ||
} | ||
|
@@ -215,7 +215,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc | |
#endif | ||
|
||
#if BUILDFLAG(ENABLE_VULKAN) | ||
@@ -702,6 +703,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, | ||
@@ -701,6 +702,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, | ||
} | ||
#endif // BUILDFLAG(IS_WIN) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.