bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-04-24 23:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 55.0.2883.44

Browse Source
This commit is contained in:
Marshall Greenblatt 2016-11-10 16:13:41 -05:00
parent aeeb51361b
commit b099f8cb79
10 changed files with 21 additions and 20 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 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/55.0.2883.28', 'chromium_checkout': 'refs/tags/55.0.2883.44',
} }

2
libcef/browser/browser_urlrequest_impl.cc
View File

@ -82,7 +82,7 @@ class NET_EXPORT CefURLFetcherResponseWriter :
return num_bytes; return num_bytes;
} }
int Finish(const net::CompletionCallback& callback) override { int Finish(int net_error, const net::CompletionCallback& callback) override {
if (url_request_.get()) if (url_request_.get())
url_request_ = NULL; url_request_ = NULL;
return net::OK; return net::OK;

5
libcef/browser/devtools_frontend.cc
View File

@ -48,7 +48,7 @@ class ResponseWriter : public net::URLFetcherResponseWriter {
int Write(net::IOBuffer* buffer, int Write(net::IOBuffer* buffer,
int num_bytes, int num_bytes,
const net::CompletionCallback& callback) override; const net::CompletionCallback& callback) override;
int Finish(const net::CompletionCallback& callback) override; int Finish(int net_error, const net::CompletionCallback& callback) override;
private: private:
base::WeakPtr<CefDevToolsFrontend> shell_devtools_; base::WeakPtr<CefDevToolsFrontend> shell_devtools_;
@ -89,7 +89,8 @@ int ResponseWriter::Write(net::IOBuffer* buffer,
return num_bytes; return num_bytes;
} }
int ResponseWriter::Finish(const net::CompletionCallback& callback) { int ResponseWriter::Finish(int net_error,
const net::CompletionCallback& callback) {
return net::OK; return net::OK;
} }

2
patch/patches/chrome_widevine.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc
index 616c9b1..cf1c881 100644 index b8bd2f4..bbcc73c 100644
--- chrome/common/chrome_content_client.cc --- chrome/common/chrome_content_client.cc
+++ chrome/common/chrome_content_client.cc +++ chrome/common/chrome_content_client.cc
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@

4
patch/patches/ime_1610.patch
View File

@ -1,8 +1,8 @@
diff --git input_method_win.cc input_method_win.cc diff --git input_method_win.cc input_method_win.cc
index 6e460e6..4946e67 100644 index 49efa46..c9eb806 100644
--- input_method_win.cc --- input_method_win.cc
+++ input_method_win.cc +++ input_method_win.cc
@@ -662,8 +662,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const { @@ -664,8 +664,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
// receiving keyboard input as long as it is an active window. This works well // receiving keyboard input as long as it is an active window. This works well
// even when the |attached_window_handle| becomes active but has not received // even when the |attached_window_handle| becomes active but has not received
// WM_FOCUS yet. // WM_FOCUS yet.

4
patch/patches/prefs_content_1161.patch
View File

@ -35,10 +35,10 @@ index 5509a57..d32b4cc 100644
bool inert_visual_viewport; bool inert_visual_viewport;
bool record_whole_document; bool record_whole_document;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index bfb5ccf..a7ed90c 100644 index 9aefa5e..fb4d3a7 100644
--- renderer/render_view_impl.cc --- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc +++ renderer/render_view_impl.cc
@@ -1488,6 +1488,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( @@ -1487,6 +1487,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
blink::WebView* web_view, blink::WebView* web_view,
CompositorDependencies* compositor_deps) { CompositorDependencies* compositor_deps) {
ApplyWebPreferences(prefs, web_view); ApplyWebPreferences(prefs, web_view);

2
patch/patches/render_widget_host_1070383005.patch
View File

@ -1,5 +1,5 @@
diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm
index be346a8..16683e7 100644 index aeee878..9180043 100644
--- render_widget_host_view_mac.mm --- render_widget_host_view_mac.mm
+++ render_widget_host_view_mac.mm +++ render_widget_host_view_mac.mm
@@ -461,9 +461,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget, @@ -461,9 +461,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,

8
patch/patches/views_widget_180_1481_1677_1749.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 diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index 852e71f..b765a5b 100644 index 3992bb0..45d82fc 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc --- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -769,6 +769,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() { @@ -769,6 +769,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
@ -17,7 +17,7 @@ index 852e71f..b765a5b 100644
if (host_ && set_focus_on_mouse_down_or_key_event_) { if (host_ && set_focus_on_mouse_down_or_key_event_) {
set_focus_on_mouse_down_or_key_event_ = false; set_focus_on_mouse_down_or_key_event_ = false;
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index 292087d..8d6da47 100644 index 28b3698..337f35d 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc --- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc +++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -44,6 +44,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase() @@ -44,6 +44,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
@ -40,7 +40,7 @@ index 292087d..8d6da47 100644
return renderer_frame_number_; 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 diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index 5e25a02..b81350b 100644 index 7ea3428..61d774c 100644
--- content/browser/renderer_host/render_widget_host_view_base.h --- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -107,6 +107,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, @@ -107,6 +107,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
@ -51,7 +51,7 @@ index 5e25a02..b81350b 100644
// This only needs to be overridden by RenderWidgetHostViewBase subclasses // This only needs to be overridden by RenderWidgetHostViewBase subclasses
// that handle content embedded within other RenderWidgetHostViews. // that handle content embedded within other RenderWidgetHostViews.
@@ -477,6 +478,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, @@ -484,6 +485,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
// destroyed before the RWHV is destroyed. // destroyed before the RWHV is destroyed.
TextInputManager* text_input_manager_; TextInputManager* text_input_manager_;

10
patch/patches/web_contents_1257.patch
View File

@ -74,10 +74,10 @@ index 5410f5a..a6aaef1 100644
int opener_render_process_id, int opener_render_process_id,
int opener_render_frame_id, int opener_render_frame_id,
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 00421e7..18a9066 100644 index e199004..4630d34 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
@@ -1570,6 +1570,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -1572,6 +1572,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);
@ -90,7 +90,7 @@ index 00421e7..18a9066 100644
WebContentsViewDelegate* delegate = WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this); GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -1600,6 +1606,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -1602,6 +1608,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::move(view_), std::move(view_),
&render_view_host_delegate_view_)); &render_view_host_delegate_view_));
} }
@ -98,7 +98,7 @@ index 00421e7..18a9066 100644
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -2053,11 +2060,14 @@ void WebContentsImpl::CreateNewWindow( @@ -2055,11 +2062,14 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace); static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context)); CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@ -114,7 +114,7 @@ index 00421e7..18a9066 100644
if (route_id != MSG_ROUTING_NONE && if (route_id != MSG_ROUTING_NONE &&
!RenderViewHost::FromID(render_process_id, route_id)) { !RenderViewHost::FromID(render_process_id, route_id)) {
// If the embedder didn't create a WebContents for this route, we need to // If the embedder didn't create a WebContents for this route, we need to
@@ -2081,6 +2091,8 @@ void WebContentsImpl::CreateNewWindow( @@ -2083,6 +2093,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.opener_render_process_id = render_process_id; create_params.opener_render_process_id = render_process_id;
create_params.opener_render_frame_id = params.opener_render_frame_id; create_params.opener_render_frame_id = params.opener_render_frame_id;
create_params.opener_suppressed = params.opener_suppressed; create_params.opener_suppressed = params.opener_suppressed;

2
patch/patches/webview_plugin_2020.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index c594edc..2c35305 100644 index d5d02cb..8c62781 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -7073,7 +7073,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -7073,7 +7073,7 @@ Keep your key file in a safe place. You will need it to create new versions of y