mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 63.0.3239.18
This commit is contained in:
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'adb61db19020ed8ecee5e91b1a0ea4c924ae2988',
|
'chromium_checkout': 'refs/tags/63.0.3239.18',
|
||||||
}
|
}
|
||||||
|
@@ -404,7 +404,7 @@ index 4f8478bfa87a..52471407518e 100644
|
|||||||
virtual void FocusedNodeChanged(const blink::WebNode& node) {}
|
virtual void FocusedNodeChanged(const blink::WebNode& node) {}
|
||||||
|
|
||||||
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
|
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
|
||||||
index 285d1d6fb031..8024d725d86c 100644
|
index 9c48e63b7f25..6c4d4d91d368 100644
|
||||||
--- content/renderer/render_frame_impl.cc
|
--- content/renderer/render_frame_impl.cc
|
||||||
+++ content/renderer/render_frame_impl.cc
|
+++ content/renderer/render_frame_impl.cc
|
||||||
@@ -2975,7 +2975,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
|
@@ -2975,7 +2975,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
||||||
index 7297db47cf2d..d47c44680415 100644
|
index f985ea2bceab..498c3b192f76 100644
|
||||||
--- content/browser/web_contents/web_contents_impl.cc
|
--- content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ content/browser/web_contents/web_contents_impl.cc
|
+++ content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -1762,6 +1762,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
@@ -1769,6 +1769,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
||||||
std::string unique_name;
|
std::string unique_name;
|
||||||
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
|
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ index 7297db47cf2d..d47c44680415 100644
|
|||||||
WebContentsViewDelegate* delegate =
|
WebContentsViewDelegate* delegate =
|
||||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||||
|
|
||||||
@@ -1772,6 +1778,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
@@ -1779,6 +1785,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
||||||
view_.reset(CreateWebContentsView(this, delegate,
|
view_.reset(CreateWebContentsView(this, delegate,
|
||||||
&render_view_host_delegate_view_));
|
&render_view_host_delegate_view_));
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,7 @@ index 7297db47cf2d..d47c44680415 100644
|
|||||||
|
|
||||||
if (browser_plugin_guest_ && !GuestMode::IsCrossProcessFrameGuest(this)) {
|
if (browser_plugin_guest_ && !GuestMode::IsCrossProcessFrameGuest(this)) {
|
||||||
view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
|
view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
|
||||||
@@ -2340,6 +2347,15 @@ void WebContentsImpl::CreateNewWindow(
|
@@ -2347,6 +2354,15 @@ void WebContentsImpl::CreateNewWindow(
|
||||||
create_params.renderer_initiated_creation =
|
create_params.renderer_initiated_creation =
|
||||||
main_frame_route_id != MSG_ROUTING_NONE;
|
main_frame_route_id != MSG_ROUTING_NONE;
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ index 7297db47cf2d..d47c44680415 100644
|
|||||||
WebContentsImpl* new_contents = NULL;
|
WebContentsImpl* new_contents = NULL;
|
||||||
if (!is_guest) {
|
if (!is_guest) {
|
||||||
create_params.context = view_->GetNativeView();
|
create_params.context = view_->GetNativeView();
|
||||||
@@ -2369,7 +2385,7 @@ void WebContentsImpl::CreateNewWindow(
|
@@ -2376,7 +2392,7 @@ void WebContentsImpl::CreateNewWindow(
|
||||||
// TODO(brettw): It seems bogus that we have to call this function on the
|
// TODO(brettw): It seems bogus that we have to call this function on the
|
||||||
// newly created object and give it one of its own member variables.
|
// newly created object and give it one of its own member variables.
|
||||||
new_view->CreateViewForWidget(
|
new_view->CreateViewForWidget(
|
||||||
@@ -48,7 +48,7 @@ index 7297db47cf2d..d47c44680415 100644
|
|||||||
}
|
}
|
||||||
// Save the created window associated with the route so we can show it
|
// Save the created window associated with the route so we can show it
|
||||||
// later.
|
// later.
|
||||||
@@ -5507,7 +5523,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
|
@@ -5514,7 +5530,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
|
||||||
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
|
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
|
||||||
RenderViewHost* render_view_host) {
|
RenderViewHost* render_view_host) {
|
||||||
RenderWidgetHostViewBase* rwh_view =
|
RenderWidgetHostViewBase* rwh_view =
|
||||||
|
@@ -17,10 +17,10 @@ index b26a7d6b8413..476b5c138555 100644
|
|||||||
.Top()
|
.Top()
|
||||||
.GetSecurityContext()
|
.GetSecurityContext()
|
||||||
diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
||||||
index bf29beabedf7..e45901940d91 100644
|
index d0ffc86d701b..8a2c5e2ee1cf 100644
|
||||||
--- third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
--- third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
||||||
+++ third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
+++ third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
||||||
@@ -1026,7 +1026,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
|
@@ -1027,7 +1027,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
|
||||||
PluginData* LocalFrame::GetPluginData() const {
|
PluginData* LocalFrame::GetPluginData() const {
|
||||||
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
|
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
Reference in New Issue
Block a user