bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 45.0.2454.26

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-08-11 18:08:35 -04:00
parent 33f860863e
commit e979611ea6
7 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patch/patches/browser_web_contents_1257.patch
View File

@@ -1,8 +1,8 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index 3aedda6..b4aa061 100644
index 1383981..2c39457 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1312,24 +1312,31 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1319,24 +1319,31 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
params.main_frame_routing_id);
frame_tree_.root()->SetFrameName(params.main_frame_name);
@@ -51,7 +51,7 @@ index 3aedda6..b4aa061 100644
}
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -1665,6 +1672,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1672,6 +1679,9 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@@ -61,7 +61,7 @@ index 3aedda6..b4aa061 100644
if (delegate_ &&
!delegate_->ShouldCreateWebContents(this,
route_id,
@@ -1673,7 +1683,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1680,7 +1690,9 @@ void WebContentsImpl::CreateNewWindow(
params.frame_name,
params.target_url,
partition_id,
@@ -72,7 +72,7 @@ index 3aedda6..b4aa061 100644
if (route_id != MSG_ROUTING_NONE &&
!RenderViewHost::FromID(render_process_id, route_id)) {
// If the embedder didn't create a WebContents for this route, we need to
@@ -1695,6 +1707,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -1702,6 +1714,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.opener_render_process_id = GetRenderProcessHost()->GetID();
create_params.opener_render_frame_id = params.opener_render_frame_id;
create_params.opener_suppressed = params.opener_suppressed;

10
patch/patches/webkit_popups.patch
View File

@@ -1,5 +1,5 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 58e8166..23c0cea 100644
index 690a8c2..4c08e15 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -774,7 +774,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -12,7 +12,7 @@ index 58e8166..23c0cea 100644
ASSERT(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 1f8413a..efeff15 100644
index a21d33a..27bc146 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -397,6 +397,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -23,7 +23,7 @@ index 1f8413a..efeff15 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -3925,9 +3926,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -3932,9 +3933,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@@ -40,7 +40,7 @@ index 1f8413a..efeff15 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index a3ece01..60adce4 100644
index 7f2884d..1a5d3b2 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -389,7 +389,8 @@ public:
@@ -53,7 +53,7 @@ index a3ece01..60adce4 100644
bool contextMenuAllowed() const
{
@@ -675,6 +676,8 @@ private:
@@ -677,6 +678,8 @@ private:
bool m_contextMenuAllowed;