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 revision c03558c9 (#326273)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-04-23 13:03:42 +03:00
parent aeb35d2f36
commit faafdd2cd7
28 changed files with 154 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patch/patches/browser_web_contents_1257.patch
View File

@@ -1,5 +1,5 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index 24122cd..52cd0c6 100644
index 3ce4b68..465b5e1 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1205,22 +1205,29 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -48,7 +48,7 @@ index 24122cd..52cd0c6 100644
}
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -1551,6 +1558,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1556,6 +1563,9 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@@ -58,7 +58,7 @@ index 24122cd..52cd0c6 100644
if (delegate_ &&
!delegate_->ShouldCreateWebContents(this,
route_id,
@@ -1559,7 +1569,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1564,7 +1574,9 @@ void WebContentsImpl::CreateNewWindow(
params.frame_name,
params.target_url,
partition_id,
@@ -69,7 +69,7 @@ index 24122cd..52cd0c6 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
@@ -1579,6 +1591,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -1584,6 +1596,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.main_frame_routing_id = main_frame_route_id;
create_params.opener = this;
create_params.opener_suppressed = params.opener_suppressed;

2
patch/patches/build.patch
View File

@@ -1,5 +1,5 @@
diff --git common.gypi common.gypi
index dccdfec..65b9540 100644
index 7c3074b..53e5f64 100644
--- common.gypi
+++ common.gypi
@@ -9,6 +9,9 @@

8
patch/patches/chrome_browser_1257.patch
View File

@@ -1,8 +1,8 @@
diff --git ui/browser.cc ui/browser.cc
index 50b6506..cc6a201 100644
index 8ba7764..16e15da 100644
--- ui/browser.cc
+++ ui/browser.cc
@@ -1592,7 +1592,9 @@ bool Browser::ShouldCreateWebContents(
@@ -1596,7 +1596,9 @@ bool Browser::ShouldCreateWebContents(
const base::string16& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -14,10 +14,10 @@ index 50b6506..cc6a201 100644
// If a BackgroundContents is created, suppress the normal WebContents.
return !MaybeCreateBackgroundContents(route_id,
diff --git ui/browser.h ui/browser.h
index 49c3962..4fac697 100644
index f5d2c62..d8af427 100644
--- ui/browser.h
+++ ui/browser.h
@@ -587,7 +587,9 @@ class Browser : public TabStripModelObserver,
@@ -590,7 +590,9 @@ class Browser : public TabStripModelObserver,
const base::string16& frame_name,
const GURL& target_url,
const std::string& partition_id,

12
patch/patches/compositor_1368.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index 4fc6a67..ed42b09 100644
index f2d1b39..faf1f48 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -130,6 +130,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
@@ -131,6 +131,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
scoped_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
ui::Compositor* compositor) {
@@ -17,7 +17,7 @@ index 4fc6a67..ed42b09 100644
return scoped_ptr<cc::SoftwareOutputDevice>(new SoftwareOutputDeviceWin(
compositor));
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index 5a6d932..07bd025 100644
index cf115b0..cddbaa0 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -15,6 +15,7 @@
@@ -28,7 +28,7 @@ index 5a6d932..07bd025 100644
#include "cc/surfaces/surface_sequence.h"
#include "cc/trees/layer_tree_host_client.h"
#include "cc/trees/layer_tree_host_single_thread_client.h"
@@ -145,6 +146,17 @@ class COMPOSITOR_EXPORT CompositorBeginFrameObserver {
@@ -147,6 +148,17 @@ class COMPOSITOR_EXPORT CompositorBeginFrameObserver {
virtual void OnSendBeginFrame(const cc::BeginFrameArgs& args) = 0;
};
@@ -46,7 +46,7 @@ index 5a6d932..07bd025 100644
// Compositor object to take care of GPU painting.
// A Browser compositor object is responsible for generating the final
// displayable form of pixels comprising a single widget's contents. It draws an
@@ -166,6 +178,9 @@ class COMPOSITOR_EXPORT Compositor
@@ -168,6 +180,9 @@ class COMPOSITOR_EXPORT Compositor
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@@ -56,7 +56,7 @@ index 5a6d932..07bd025 100644
// Sets the root of the layer tree drawn by this Compositor. The root layer
// must have no parent. The compositor's root layer is reset if the root layer
// is destroyed. NULL can be passed to reset the root layer, in which case the
@@ -322,6 +337,8 @@ class COMPOSITOR_EXPORT Compositor
@@ -324,6 +339,8 @@ class COMPOSITOR_EXPORT Compositor
ui::ContextFactory* context_factory_;

8
patch/patches/content_nav_1129.patch
View File

@@ -19,7 +19,7 @@ index 6e66fe3..32957fc 100644
bool ContentRendererClient::ShouldFork(blink::WebFrame* frame,
const GURL& url,
diff --git public/renderer/content_renderer_client.h public/renderer/content_renderer_client.h
index ca4d51d..5df0485 100644
index e4e8f03..f4392d9 100644
--- public/renderer/content_renderer_client.h
+++ public/renderer/content_renderer_client.h
@@ -193,7 +193,6 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -39,10 +39,10 @@ index ca4d51d..5df0485 100644
// Returns true if we should fork a new process for the given navigation.
// If |send_referrer| is set to false (which is the default), no referrer
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index 88b26d2..07ed0cb 100644
index 3cf9e9b..21cebc8 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -4076,7 +4076,6 @@ void RenderFrameImpl::OnCommitNavigation(
@@ -4186,7 +4186,6 @@ void RenderFrameImpl::OnFailedNavigation(
WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
RenderFrame* render_frame,
const NavigationPolicyInfo& info) {
@@ -50,7 +50,7 @@ index 88b26d2..07ed0cb 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
@@ -4091,7 +4090,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
@@ -4201,7 +4200,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
info.isRedirect)) {
return blink::WebNavigationPolicyIgnore;
}

2
patch/patches/gritsettings.patch
View File

@@ -1,5 +1,5 @@
diff --git resource_ids resource_ids
index a0c369d..bea28d8 100644
index d56ba05..e754058 100644
--- resource_ids
+++ resource_ids
@@ -14,6 +14,12 @@

4
patch/patches/prefs_content_1161.patch
View File

@@ -35,10 +35,10 @@ index 8d25487..23b25ae 100644
bool slimming_paint_enabled;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index c9cbd66..8124639 100644
index 66d2c0d..1502e0a 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -932,6 +932,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
@@ -950,6 +950,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->setJavaEnabled(prefs.java_enabled);

8
patch/patches/public_browser_1257.patch
View File

@@ -52,7 +52,7 @@ index 4380412..a67739d 100644
// Creates a new WebContents.
diff --git web_contents_delegate.cc web_contents_delegate.cc
index 0e48d7c..aa46ad9 100644
index d4028fb..285f0c3 100644
--- web_contents_delegate.cc
+++ web_contents_delegate.cc
@@ -133,7 +133,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
@@ -67,10 +67,10 @@ index 0e48d7c..aa46ad9 100644
}
diff --git web_contents_delegate.h web_contents_delegate.h
index 1367f0b..7da1128 100644
index ef73451..17374f1 100644
--- web_contents_delegate.h
+++ web_contents_delegate.h
@@ -36,9 +36,11 @@ class DownloadItem;
@@ -37,9 +37,11 @@ class DownloadItem;
class JavaScriptDialogManager;
class PageState;
class RenderViewHost;
@@ -82,7 +82,7 @@ index 1367f0b..7da1128 100644
struct ColorSuggestion;
struct ContextMenuParams;
struct DropData;
@@ -294,7 +296,9 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -292,7 +294,9 @@ class CONTENT_EXPORT WebContentsDelegate {
const base::string16& frame_name,
const GURL& target_url,
const std::string& partition_id,

6
patch/patches/render_process_host_1429.patch
View File

@@ -1,8 +1,8 @@
diff --git render_process_host_impl.cc render_process_host_impl.cc
index 91dd8b3..3cba806 100644
index 1e20d8e..6c0f5f4 100644
--- render_process_host_impl.cc
+++ render_process_host_impl.cc
@@ -2089,6 +2089,8 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
@@ -2111,6 +2111,8 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
#endif
RemoveUserData(kSessionStorageHolderKey);
@@ -11,7 +11,7 @@ index 91dd8b3..3cba806 100644
IDMap<IPC::Listener>::iterator iter(&listeners_);
while (!iter.IsAtEnd()) {
iter.GetCurrentValue()->OnMessageReceived(
@@ -2098,8 +2100,6 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
@@ -2120,8 +2122,6 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
iter.Advance();
}

6
patch/patches/spellcheck_137.patch
View File

@@ -1,8 +1,8 @@
diff --git spellcheck_factory.cc spellcheck_factory.cc
index 7d7e1df..b623657 100644
index bd4ac1f..ce1d28e 100644
--- spellcheck_factory.cc
+++ spellcheck_factory.cc
@@ -15,6 +15,13 @@
@@ -16,6 +16,13 @@
#include "content/public/browser/render_process_host.h"
#include "ui/base/l10n/l10n_util.h"
@@ -16,7 +16,7 @@ index 7d7e1df..b623657 100644
// static
SpellcheckService* SpellcheckServiceFactory::GetForContext(
content::BrowserContext* context) {
@@ -37,7 +44,7 @@ SpellcheckService* SpellcheckServiceFactory::GetForRenderProcessId(
@@ -38,7 +45,7 @@ SpellcheckService* SpellcheckServiceFactory::GetForRenderProcessId(
// static
SpellcheckServiceFactory* SpellcheckServiceFactory::GetInstance() {

4
patch/patches/ui_webview_1257.patch
View File

@@ -1,8 +1,8 @@
diff --git web_dialog_view.cc web_dialog_view.cc
index 8fe27bf..04bd1a6 100644
index 4a5a114..b28fb3c 100644
--- web_dialog_view.cc
+++ web_dialog_view.cc
@@ -339,7 +339,9 @@ bool WebDialogView::ShouldCreateWebContents(
@@ -340,7 +340,9 @@ bool WebDialogView::ShouldCreateWebContents(
const base::string16& frame_name,
const GURL& target_url,
const std::string& partition_id,

14
patch/patches/views_widget_180.patch
View File

@@ -43,7 +43,7 @@ index b53fc7f..0b24d2a 100644
if (input_method)
input_method->OnBlur();
diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc
index 1316b8b..588e591 100644
index 125e8f0..275e0d8 100644
--- desktop_aura/desktop_window_tree_host_x11.cc
+++ desktop_aura/desktop_window_tree_host_x11.cc
@@ -153,7 +153,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@@ -108,7 +108,7 @@ index 1316b8b..588e591 100644
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(),
0, // border width
@@ -1717,6 +1729,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
@@ -1719,6 +1731,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
}
break;
}
@@ -153,10 +153,10 @@ index 94d4b1b..2609f46 100644
};
diff --git widget.cc widget.cc
index 8893d8c..e517828 100644
index 64e131e..aec1b43 100644
--- widget.cc
+++ widget.cc
@@ -111,6 +111,7 @@ Widget::InitParams::InitParams()
@@ -110,6 +110,7 @@ Widget::InitParams::InitParams()
use_system_default_icon(false),
show_state(ui::SHOW_STATE_DEFAULT),
parent(NULL),
@@ -164,7 +164,7 @@ index 8893d8c..e517828 100644
native_widget(NULL),
desktop_window_tree_host(NULL),
layer_type(ui::LAYER_TEXTURED),
@@ -134,6 +135,7 @@ Widget::InitParams::InitParams(Type type)
@@ -133,6 +134,7 @@ Widget::InitParams::InitParams(Type type)
use_system_default_icon(false),
show_state(ui::SHOW_STATE_DEFAULT),
parent(NULL),
@@ -172,7 +172,7 @@ index 8893d8c..e517828 100644
native_widget(NULL),
desktop_window_tree_host(NULL),
layer_type(ui::LAYER_TEXTURED),
@@ -308,7 +310,7 @@ void Widget::Init(const InitParams& in_params) {
@@ -307,7 +309,7 @@ void Widget::Init(const InitParams& in_params) {
InitParams params = in_params;
params.child |= (params.type == InitParams::TYPE_CONTROL);
@@ -181,7 +181,7 @@ index 8893d8c..e517828 100644
if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
params.type != views::Widget::InitParams::TYPE_WINDOW &&
@@ -371,7 +373,12 @@ void Widget::Init(const InitParams& in_params) {
@@ -370,7 +372,12 @@ void Widget::Init(const InitParams& in_params) {
Minimize();
} else if (params.delegate) {
SetContentsView(params.delegate->GetContentsView());

20
patch/patches/webkit_popups.patch
View File

@@ -1,8 +1,8 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 606a744..4003e49 100644
index b47a0c6..1c59701 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -775,7 +775,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -754,7 +754,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::createPopupMenu(LocalFrame& frame, PopupMenuClient* client)
{
@@ -12,10 +12,10 @@ index 606a744..4003e49 100644
if (RuntimeEnabledFeatures::htmlPopupMenuEnabled() && RuntimeEnabledFeatures::pagePopupEnabled())
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index aa9c0c5..9f14208 100644
index ee49268..ce794e9 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -396,6 +396,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -394,6 +394,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false)
@@ -23,7 +23,7 @@ index aa9c0c5..9f14208 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -4036,9 +4037,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -4006,9 +4007,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@@ -40,10 +40,10 @@ index aa9c0c5..9f14208 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index cf3f40e..f6acc16 100644
index 285d824..765a2dd 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -394,7 +394,8 @@ public:
@@ -391,7 +391,8 @@ public:
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
@@ -53,7 +53,7 @@ index cf3f40e..f6acc16 100644
bool contextMenuAllowed() const
{
@@ -688,6 +689,8 @@ private:
@@ -685,6 +686,8 @@ private:
bool m_contextMenuAllowed;
@@ -63,10 +63,10 @@ index cf3f40e..f6acc16 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index a7e9f99..f671362 100644
index be2c85b..1e0057e 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -403,6 +403,7 @@ public:
@@ -395,6 +395,7 @@ public:
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);