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 47.0.2526.49

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-11-05 12:37:54 -05:00
parent cf20046bba
commit ce6efff27f
3 changed files with 15 additions and 15 deletions
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/47.0.2526.16', 'chromium_checkout': 'refs/tags/47.0.2526.49',
} }

6
patch/patches/content_nav_1129.patch
View File

@@ -39,10 +39,10 @@ index 5adc6ff..88663e1 100644
// Returns true if we should fork a new process for the given navigation. // 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 // 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 diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index 7582290..e153c32 100644 index 1601fc8..52016a1 100644
--- renderer/render_frame_impl.cc --- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc
@@ -4274,7 +4274,6 @@ void RenderFrameImpl::OnFailedNavigation( @@ -4278,7 +4278,6 @@ void RenderFrameImpl::OnFailedNavigation(
WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
RenderFrame* render_frame, RenderFrame* render_frame,
const NavigationPolicyInfo& info) { const NavigationPolicyInfo& info) {
@@ -50,7 +50,7 @@ index 7582290..e153c32 100644
// The handlenavigation API is deprecated and will be removed once // The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved. // crbug.com/325351 is resolved.
if (info.urlRequest.url() != GURL(kSwappedOutURL) && if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
@@ -4284,7 +4283,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -4288,7 +4287,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
info.navigationType, info.defaultPolicy, info.isRedirect)) { info.navigationType, info.defaultPolicy, info.isRedirect)) {
return blink::WebNavigationPolicyIgnore; return blink::WebNavigationPolicyIgnore;
} }

22
patch/patches/views_widget_180_1677.patch
View File

@@ -45,20 +45,20 @@ index 48368f9..90ef876 100644
bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) { bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) {
diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc
index ed0cb1d..62e3872 100644 index 27c5e55..0698f8b 100644
--- desktop_aura/desktop_window_tree_host_x11.cc --- desktop_aura/desktop_window_tree_host_x11.cc
+++ desktop_aura/desktop_window_tree_host_x11.cc +++ desktop_aura/desktop_window_tree_host_x11.cc
@@ -172,7 +172,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( @@ -173,7 +173,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
window_parent_(NULL),
custom_window_shape_(false), custom_window_shape_(false),
urgency_hint_set_(false), urgency_hint_set_(false),
activatable_(true),
- close_widget_factory_(this) { - close_widget_factory_(this) {
+ close_widget_factory_(this), + close_widget_factory_(this),
+ xwindow_destroyed_(false) { + xwindow_destroyed_(false) {
} }
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() { DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
@@ -382,7 +383,8 @@ void DesktopWindowTreeHostX11::CloseNow() { @@ -384,7 +385,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
// Actually free our native resources. // Actually free our native resources.
if (ui::PlatformEventSource::GetInstance()) if (ui::PlatformEventSource::GetInstance())
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this); ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@@ -68,7 +68,7 @@ index ed0cb1d..62e3872 100644
xwindow_ = None; xwindow_ = None;
desktop_native_widget_aura_->OnHostClosed(); desktop_native_widget_aura_->OnHostClosed();
@@ -526,6 +528,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement( @@ -533,6 +535,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
} }
gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const { gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const {
@@ -77,7 +77,7 @@ index ed0cb1d..62e3872 100644
return ToDIPRect(bounds_in_pixels_); return ToDIPRect(bounds_in_pixels_);
} }
@@ -963,6 +967,8 @@ void DesktopWindowTreeHostX11::HideImpl() { @@ -970,6 +974,8 @@ void DesktopWindowTreeHostX11::HideImpl() {
} }
gfx::Rect DesktopWindowTreeHostX11::GetBounds() const { gfx::Rect DesktopWindowTreeHostX11::GetBounds() const {
@@ -86,7 +86,7 @@ index ed0cb1d..62e3872 100644
return bounds_in_pixels_; return bounds_in_pixels_;
} }
@@ -1020,6 +1026,8 @@ void DesktopWindowTreeHostX11::SetBounds( @@ -1027,6 +1033,8 @@ void DesktopWindowTreeHostX11::SetBounds(
} }
gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const { gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const {
@@ -95,7 +95,7 @@ index ed0cb1d..62e3872 100644
return bounds_in_pixels_.origin(); return bounds_in_pixels_.origin();
} }
@@ -1133,9 +1141,13 @@ void DesktopWindowTreeHostX11::InitX11Window( @@ -1140,9 +1148,13 @@ void DesktopWindowTreeHostX11::InitX11Window(
} }
} }
@@ -110,7 +110,7 @@ index ed0cb1d..62e3872 100644
bounds_in_pixels_.y(), bounds_in_pixels_.width(), bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(), bounds_in_pixels_.height(),
0, // border width 0, // border width
@@ -1789,6 +1801,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent( @@ -1796,6 +1808,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
} }
break; break;
} }
@@ -122,7 +122,7 @@ index ed0cb1d..62e3872 100644
if (xev->xfocus.mode != NotifyGrab) { if (xev->xfocus.mode != NotifyGrab) {
ReleaseCapture(); ReleaseCapture();
diff --git desktop_aura/desktop_window_tree_host_x11.h desktop_aura/desktop_window_tree_host_x11.h diff --git desktop_aura/desktop_window_tree_host_x11.h desktop_aura/desktop_window_tree_host_x11.h
index 73e9e3e6..deb2cef 100644 index 09b5993..33a0580 100644
--- desktop_aura/desktop_window_tree_host_x11.h --- desktop_aura/desktop_window_tree_host_x11.h
+++ desktop_aura/desktop_window_tree_host_x11.h +++ desktop_aura/desktop_window_tree_host_x11.h
@@ -85,6 +85,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 @@ -85,6 +85,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -144,7 +144,7 @@ index 73e9e3e6..deb2cef 100644
// Whenever the bounds are set, we keep the previous set of bounds around so // Whenever the bounds are set, we keep the previous set of bounds around so
// we can have a better chance of getting the real // we can have a better chance of getting the real
// |restored_bounds_in_pixels_|. Window managers tend to send a Configure // |restored_bounds_in_pixels_|. Window managers tend to send a Configure
@@ -351,6 +356,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 @@ -353,6 +358,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;