mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 52.0.2743.116
This commit is contained in:
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/52.0.2743.75',
|
'chromium_checkout': 'refs/tags/52.0.2743.116',
|
||||||
}
|
}
|
||||||
|
@@ -1085,6 +1085,10 @@ void CefRenderWidgetHostViewOSR::SetBeginFrameSource(
|
|||||||
// See https://codereview.chromium.org/1841083007.
|
// See https://codereview.chromium.org/1841083007.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CefRenderWidgetHostViewOSR::IsAutoResizeEnabled() const {
|
||||||
|
return render_widget_host_->auto_resize_enabled();
|
||||||
|
}
|
||||||
|
|
||||||
bool CefRenderWidgetHostViewOSR::InstallTransparency() {
|
bool CefRenderWidgetHostViewOSR::InstallTransparency() {
|
||||||
if (transparent_) {
|
if (transparent_) {
|
||||||
SetBackgroundColor(SkColor());
|
SetBackgroundColor(SkColor());
|
||||||
|
@@ -220,6 +220,7 @@ class CefRenderWidgetHostViewOSR
|
|||||||
const base::TimeTicks& timebase,
|
const base::TimeTicks& timebase,
|
||||||
const base::TimeDelta& interval) override;
|
const base::TimeDelta& interval) override;
|
||||||
void SetBeginFrameSource(cc::BeginFrameSource* source) override;
|
void SetBeginFrameSource(cc::BeginFrameSource* source) override;
|
||||||
|
bool IsAutoResizeEnabled() const override;
|
||||||
|
|
||||||
bool InstallTransparency();
|
bool InstallTransparency();
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git render_widget_host_view_guest.cc render_widget_host_view_guest.cc
|
diff --git render_widget_host_view_guest.cc render_widget_host_view_guest.cc
|
||||||
index d5434c9..2dd1660 100644
|
index 839f8ff..b65a1b4 100644
|
||||||
--- render_widget_host_view_guest.cc
|
--- render_widget_host_view_guest.cc
|
||||||
+++ render_widget_host_view_guest.cc
|
+++ render_widget_host_view_guest.cc
|
||||||
@@ -243,6 +243,9 @@ void RenderWidgetHostViewGuest::Destroy() {
|
@@ -243,6 +243,9 @@ void RenderWidgetHostViewGuest::Destroy() {
|
||||||
|
@@ -39,10 +39,10 @@ index d96adc9..348ae16 100644
|
|||||||
// built in media player for the given |url|. Defaults to false.
|
// built in media player for the given |url|. Defaults to false.
|
||||||
virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
|
virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
|
||||||
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 8d049b2..8f89c29 100644
|
index 400a60c..2c9fe67 100644
|
||||||
--- renderer/render_frame_impl.cc
|
--- renderer/render_frame_impl.cc
|
||||||
+++ renderer/render_frame_impl.cc
|
+++ renderer/render_frame_impl.cc
|
||||||
@@ -4770,7 +4770,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
@@ -4779,7 +4779,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||||
(pending_navigation_params_ &&
|
(pending_navigation_params_ &&
|
||||||
!pending_navigation_params_->request_params.redirects.empty());
|
!pending_navigation_params_->request_params.redirects.empty());
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@ index 8d049b2..8f89c29 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 (GetContentClient()->renderer()->HandleNavigation(
|
if (GetContentClient()->renderer()->HandleNavigation(
|
||||||
@@ -4779,7 +4778,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
@@ -4788,7 +4787,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||||
is_redirect)) {
|
is_redirect)) {
|
||||||
return blink::WebNavigationPolicyIgnore;
|
return blink::WebNavigationPolicyIgnore;
|
||||||
}
|
}
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
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 86481a9..e2e56c0 100644
|
index bc7ed53..b673bd4 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
|
||||||
@@ -572,9 +572,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
|
@@ -577,9 +577,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
|
||||||
// Paint this view host with |background_color_| when there is no content
|
// Paint this view host with |background_color_| when there is no content
|
||||||
// ready to draw.
|
// ready to draw.
|
||||||
background_layer_.reset([[CALayer alloc] init]);
|
background_layer_.reset([[CALayer alloc] init]);
|
||||||
|
@@ -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 4bb17af87..3143357 100644
|
index 8737a71..6bf3224 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
|
||||||
@@ -685,6 +685,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
|
@@ -685,6 +685,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
|
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
|
||||||
index ab5b0e7..c977d57 100644
|
index 3d0bf95..e58379a 100644
|
||||||
--- Source/web/ChromeClientImpl.cpp
|
--- Source/web/ChromeClientImpl.cpp
|
||||||
+++ Source/web/ChromeClientImpl.cpp
|
+++ Source/web/ChromeClientImpl.cpp
|
||||||
@@ -880,7 +880,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
|
@@ -883,7 +883,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
|
||||||
PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
|
PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
|
||||||
{
|
{
|
||||||
notifyPopupOpeningObservers();
|
notifyPopupOpeningObservers();
|
||||||
|
Reference in New Issue
Block a user