bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-17 20:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 68.0.3440.84

Browse Source
This commit is contained in:
Marshall Greenblatt 2018-08-02 17:21:57 -04:00
parent 4a354e6cf1
commit be070f9c4a
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

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

5
libcef/browser/osr/render_widget_host_view_osr.cc
View File

@ -734,9 +734,8 @@ void CefRenderWidgetHostViewOSR::GetScreenInfo(
*results = ScreenInfoFrom(screen_info);
}
gfx::Vector2d CefRenderWidgetHostViewOSR::GetOffsetFromRootSurface() {
return gfx::Vector2d();
}
void CefRenderWidgetHostViewOSR::TransformPointToRootSurface(
gfx::PointF* point) {}
gfx::Rect CefRenderWidgetHostViewOSR::GetBoundsInRootWindow() {
if (!browser_impl_.get())

2
libcef/browser/osr/render_widget_host_view_osr.h
View File

@ -154,7 +154,7 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
const gfx::Size& output_size,
base::OnceCallback<void(const SkBitmap&)> callback) override;
void GetScreenInfo(content::ScreenInfo* results) const override;
gfx::Vector2d GetOffsetFromRootSurface() override;
void TransformPointToRootSurface(gfx::PointF* point) override;
gfx::Rect GetBoundsInRootWindow() override;
viz::SurfaceId GetCurrentSurfaceId() const override;
content::BrowserAccessibilityManager* CreateBrowserAccessibilityManager(

10
patch/patches/content_2015.patch
View File

@ -94,10 +94,10 @@ index b23698013a09..d60eb48c6efd 100644
"WillFailRequest state should come before WillProcessResponse");
return render_frame_host_;
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index daff8c65a981..3faa788f1e6f 100644
index cd755cbc3f2c..23d1aad71b6e 100644
--- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc
@@ -1599,6 +1599,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
@@ -1602,6 +1602,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
if (GetNavigationHandle()) {
GetNavigationHandle()->set_net_error_code(
static_cast<net::Error>(params.error_code));
@ -105,7 +105,7 @@ index daff8c65a981..3faa788f1e6f 100644
}
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
@@ -3456,9 +3457,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
@@ -3476,9 +3477,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
@ -118,7 +118,7 @@ index daff8c65a981..3faa788f1e6f 100644
// TODO(https://crbug.com/813479): Investigate why we need to explicitly
// specify task runner for BrowserThread::IO here.
// Bind calls to the BindRegistry should come on to the IO thread by
@@ -3858,9 +3859,9 @@ void RenderFrameHostImpl::CommitNavigation(
@@ -3880,9 +3881,9 @@ void RenderFrameHostImpl::CommitNavigation(
// however only do this for cross-document navigations, because the
// alternative would be redundant effort.
network::mojom::URLLoaderFactoryPtrInfo default_factory_info;
@ -131,7 +131,7 @@ index daff8c65a981..3faa788f1e6f 100644
if (subresource_loader_params &&
subresource_loader_params->loader_factory_info.is_valid()) {
// If the caller has supplied a default URLLoaderFactory override (for
@@ -4552,8 +4553,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
@@ -4574,8 +4575,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory(
this, false /* is_navigation */, false /* is_download */,
&default_factory_request);

4
patch/patches/rwh_background_color_1984.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index aefe11960955..7d5cdbead3f8 100644
index 861122e99087..fc464f5244b7 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -726,10 +726,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const {
@ -19,7 +19,7 @@ index aefe11960955..7d5cdbead3f8 100644
}
void RenderWidgetHostViewAura::WindowTitleChanged() {
@@ -1924,6 +1926,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -1925,6 +1927,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
if (frame_sink_id_.is_valid())
window_->SetEmbedFrameSinkId(frame_sink_id_);

4
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index d52e0e45d4e1..4cc91095d9c9 100644
index 1c52a5fd396f..96cd3a6230e9 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -422,6 +422,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
@ -18,7 +18,7 @@ index d52e0e45d4e1..4cc91095d9c9 100644
return renderer_frame_number_;
}
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index be17cb811c58..d06168e39008 100644
index 048fd7d3a8bf..b0f5ea8a085c 100644
--- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -84,6 +84,7 @@ class CursorManager;