Update to Chromium version 69.0.3497.100

This commit is contained in:
Marshall Greenblatt 2018-09-20 17:12:42 +02:00
parent bf8b64d70e
commit 461fa1fe83
5 changed files with 8 additions and 8 deletions

View File

@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/69.0.3497.81',
'chromium_checkout': 'refs/tags/69.0.3497.100',
}

View File

@ -364,7 +364,7 @@ index 2f1f46075b27..94f300dfea5d 100644
virtual void FocusedNodeChanged(const blink::WebNode& node) {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index f6adabc683c0..e54a9ca14f10 100644
index 9571ea0233e8..c7c4b0bb737b 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3473,7 +3473,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@ -377,7 +377,7 @@ index f6adabc683c0..e54a9ca14f10 100644
params.mime_type.Utf8(), &found, &info, &mime_type));
if (!found)
return nullptr;
@@ -3838,6 +3839,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
@@ -3847,6 +3848,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
void RenderFrameImpl::FrameFocused() {
Send(new FrameHostMsg_FrameFocused(routing_id_));
@ -387,10 +387,10 @@ index f6adabc683c0..e54a9ca14f10 100644
void RenderFrameImpl::WillCommitProvisionalLoad() {
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index ca6a21b03082..a090b13d65e5 100644
index c078565cef71..841601d8fc24 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -866,6 +866,8 @@ void RenderThreadImpl::Init(
@@ -865,6 +865,8 @@ void RenderThreadImpl::Init(
StartServiceManagerConnection();

View File

@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 4ef83e1a9421..ac1863275e0e 100644
index 1b14d628a63b..b29e7741ffa3 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -901,6 +901,7 @@ split_static_library("ui") {

View File

@ -65,7 +65,7 @@ index 976bae9c792b..10fb75b0af57 100644
void WebDevToolsAgentImpl::Session::SendProtocolResponse(int session_id,
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 464a41e6f278..7e29a6a66bf4 100644
index 52810bba03b0..88f5bd7066c8 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1264,7 +1264,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {

View File

@ -73,7 +73,7 @@ index fed51c0988ff..0954c1e7de21 100644
LayoutRect DebugRect() const override;
diff --git third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc
index c900e894b44e..47d04d54734a 100644
index 5f13a443aff2..17066cc18e50 100644
--- third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc
+++ third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc
@@ -1342,6 +1342,7 @@ void CompositedLayerMapping::ComputeGraphicsLayerParentLocation(