Update to Chromium version 60.0.3112.40

This commit is contained in:
Marshall Greenblatt
2017-06-27 12:50:17 -04:00
parent 7afb6c61ff
commit 86bb301075
13 changed files with 50 additions and 29 deletions

View File

@@ -17,7 +17,7 @@ index 372b21d..78107f3 100644
.Top()
.GetSecurityContext()
diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 9c6d497..6296f53 100644
index 97a5393..21da4ee 100644
--- third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -930,7 +930,7 @@ ContentSettingsClient* LocalFrame::GetContentSettingsClient() {