From cd95a80c126797970a224ce6df65f28c1712d59c Mon Sep 17 00:00:00 2001 From: Max <41635752+mkarolin@users.noreply.github.com> Date: Tue, 7 Mar 2023 14:08:34 -0500 Subject: [PATCH] Upgrade from Chromium 111.0.5563.50 to Chromium 111.0.5563.64 (1.49.x). (#17496) * Upgrade from Chromium 111.0.5563.50 to Chromium 111.0.5563.64 * Upgrade patches from Chromium 111.0.5563.50 to Chromium 111.0.5563.64 * Update pins list timestamp --------- Co-authored-by: brave-builds --- .../input_file_parsers.cc | 4 +- package.json | 2 +- patches/chrome-VERSION.patch | 4 +- ...-renderer_host-navigation_request.cc.patch | 2 +- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +++++++++---------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index 213ffc027e7a..957c4054baa5 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -535,9 +535,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input, Pinsets* pinsets, base::Time* timestamp) { constexpr base::StringPiece brave_certs = R"brave_certs( -# Last updated: Wed Mar 1 22:08:14 UTC 2023 +# Last updated: Mon Mar 6 19:41:11 UTC 2023 PinsListTimestamp -1677708494 +1678131671 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ diff --git a/package.json b/package.json index f14a17ced682..a5c24bc1f04d 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "111.0.5563.50", + "tag": "111.0.5563.64", "repository": { "url": "https://github.com/chromium/chromium" } diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index c88ec0dcea0b..13b843e35d54 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index fe66cb5cf135212c1436490e44e99a7eba024009..df9b1fc5e028a63f5a78d9611059c5dbd52a0ef8 100644 +index aa3432e5b4f1819b96e007b9d5144b525a7c3f27..f98260e3eb684d8e3082ee3379a282aa85c0b683 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=111 -MINOR=0 -BUILD=5563 --PATCH=50 +-PATCH=64 +MINOR=1 +BUILD=49 +PATCH=119 diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 19ce215502b2..4651b8d7ec9e 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index cee8f0967790ce620a21c52dc69d327a01a5cbda..8eb6a328da565e6bfa11b7532abd687a887e1d45 100644 +index 4b552797303b8160a3d7012eab371599816f2a93..bd0e356d9ff131473b42e87d9b8007d135f07550 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -3055,6 +3055,7 @@ void NavigationRequest::OnRequestRedirected( diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index aeda41927d33..23c4f9ebfd89 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884950bb4fc 100644 +index b52a098268b9fb68bebe93f080446b7ef09aa44c..fbe8114badd30100c81e16bb253da4d077fdd7cb 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3120,6 +3120,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -3114,6 +3114,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -3151,6 +3152,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -3145,6 +3146,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -3181,6 +3183,7 @@ absl::optional>> +@@ -3175,6 +3177,7 @@ absl::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return absl::nullopt; @@ -26,7 +26,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3195,6 +3198,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3189,6 +3192,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3228,6 +3232,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3222,6 +3226,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3368,6 +3373,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3362,6 +3367,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( return ScriptValue::CreateNull(script_state->GetIsolate()); } @@ -50,7 +50,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, kFunctionName, "no framebuffer bound"); -@@ -3764,6 +3770,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3758,6 +3764,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3779,6 +3786,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3773,6 +3780,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3871,6 +3879,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3865,6 +3873,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3926,6 +3935,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3920,6 +3929,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3936,6 +3946,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3930,6 +3940,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3987,6 +3998,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3981,6 +3992,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -4018,6 +4030,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -4012,6 +4024,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -4048,6 +4061,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -4042,6 +4055,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSampleType( -@@ -4060,6 +4074,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -4054,6 +4068,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 return EnsureNotNull(shader->Source()); } -@@ -4085,6 +4100,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -4079,6 +4094,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -4119,6 +4135,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -4113,6 +4129,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4378,6 +4395,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4372,6 +4389,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4402,6 +4420,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4396,6 +4414,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4479,6 +4498,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4473,6 +4492,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 8e2d6a666df4af572d72e92f33197f80392364da..edf69c6662a70091047737001cbe8884 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4838,6 +4858,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4832,6 +4852,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return;