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 49.0.2623.87

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-03-09 18:33:44 -05:00
parent 9e0fda80bd
commit 2a6491bf8d
8 changed files with 30 additions and 30 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
{
'chromium_checkout': 'refs/tags/49.0.2623.54',
'chromium_checkout': 'refs/tags/49.0.2623.87',
}

8
patch/patches/browser_web_contents_1257.patch
View File

@@ -1,8 +1,8 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index 233c1e0..e95858d 100644
index b5b0b78..2ee9174 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1387,32 +1387,40 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1373,32 +1373,40 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
main_frame_widget_routing_id);
frame_tree_.root()->SetFrameName(params.main_frame_name);
@@ -62,7 +62,7 @@ index 233c1e0..e95858d 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -1834,11 +1842,14 @@ void WebContentsImpl::CreateNewWindow(
@@ -1820,11 +1828,14 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@@ -78,7 +78,7 @@ index 233c1e0..e95858d 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
@@ -1859,6 +1870,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -1845,6 +1856,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.opener_render_process_id = render_process_id;
create_params.opener_render_frame_id = params.opener_render_frame_id;
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 514b129..036fe51 100644
index 2063a6c..282cd0d 100644
--- common.gypi
+++ common.gypi
@@ -9,6 +9,9 @@

2
patch/patches/content_nav_1129.patch
View File

@@ -39,7 +39,7 @@ index 45686b5..18548a0 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 16d742f..f9e4238 100644
index 592cd08..7515ef2 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -4687,7 +4687,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(

8
patch/patches/events_x_utils.patch
View File

@@ -1,10 +1,10 @@
diff --git events_x_utils.h events_x_utils.h
index dfa821f..f918051 100644
index 15c4e38..592417ce 100644
--- events_x_utils.h
+++ events_x_utils.h
@@ -82,7 +82,7 @@ bool GetFlingDataFromXEvent(const XEvent& xev,
float* vy_ordinal,
bool* is_cancel);
@@ -80,7 +80,7 @@ EVENTS_X_EXPORT bool GetFlingDataFromXEvent(const XEvent& xev,
float* vy_ordinal,
bool* is_cancel);
-EVENTS_X_EXPORT void ResetTimestampRolloverCountersForTesting();
+void ResetTimestampRolloverCountersForTesting();

14
patch/patches/prefs_content_1161.patch
View File

@@ -1,8 +1,8 @@
diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h
index e3efceb..f5b3e2f 100644
index a1917f5..765fe1c 100644
--- public/common/common_param_traits_macros.h
+++ public/common/common_param_traits_macros.h
@@ -194,6 +194,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@@ -195,6 +195,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
@@ -11,7 +11,7 @@ index e3efceb..f5b3e2f 100644
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
diff --git public/common/web_preferences.cc public/common/web_preferences.cc
index 8ec979c..9fc043d 100644
index 68ccbb4..8460874 100644
--- public/common/web_preferences.cc
+++ public/common/web_preferences.cc
@@ -172,6 +172,7 @@ WebPreferences::WebPreferences()
@@ -20,10 +20,10 @@ index 8ec979c..9fc043d 100644
navigate_on_drag_drop(true),
+ base_background_color(0xFFFFFFFF), // Color::white
v8_cache_options(V8_CACHE_OPTIONS_DEFAULT),
inert_visual_viewport(false),
cookie_enabled(true),
pepper_accelerated_video_decode_enabled(false),
diff --git public/common/web_preferences.h public/common/web_preferences.h
index 9926fc6..8cb6fee 100644
index b784443..b04d69f 100644
--- public/common/web_preferences.h
+++ public/common/web_preferences.h
@@ -173,6 +173,7 @@ struct CONTENT_EXPORT WebPreferences {
@@ -32,10 +32,10 @@ index 9926fc6..8cb6fee 100644
bool navigate_on_drag_drop;
+ uint32_t base_background_color;
V8CacheOptions v8_cache_options;
bool inert_visual_viewport;
// This flags corresponds to a Page's Settings' setCookieEnabled state. It
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index 2f80795..9eddd24 100644
index c2c266c..0a88250 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -938,6 +938,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,

2
patch/patches/views_widget_180_1677.patch
View File

@@ -346,7 +346,7 @@ index 5ab84f9..c4095fa 100644
x_active_window_ = None;
}
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 18aa4c6..147c5a7 100644
index 02a570db6..2225c88 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -126,6 +126,7 @@ Widget::InitParams::InitParams()

22
patch/patches/webkit_overlay_scrollbar_color_588709.patch
View File

@@ -1,8 +1,8 @@
diff --git Source/core/frame/FrameView.cpp Source/core/frame/FrameView.cpp
index f9edd39..90947ba 100644
index 6e36bd9..e3bc581 100644
--- Source/core/frame/FrameView.cpp
+++ Source/core/frame/FrameView.cpp
@@ -356,24 +356,6 @@ void FrameView::invalidateAllCustomScrollbarsOnActiveChanged()
@@ -357,24 +357,6 @@ void FrameView::invalidateAllCustomScrollbarsOnActiveChanged()
recalculateCustomScrollbarStyle();
}
@@ -27,7 +27,7 @@ index f9edd39..90947ba 100644
void FrameView::clear()
{
reset();
@@ -1833,7 +1815,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor)
@@ -1834,7 +1816,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor)
if (compositedLayerMapping->mainGraphicsLayer())
compositedLayerMapping->mainGraphicsLayer()->setNeedsDisplay();
}
@@ -49,10 +49,11 @@ index 09d6cb6..113a7b9 100644
void clear();
diff --git Source/core/layout/LayoutBox.cpp Source/core/layout/LayoutBox.cpp
index 596df85..0dcaa00 100644
index 596df85..1519d5c 100644
--- Source/core/layout/LayoutBox.cpp
+++ Source/core/layout/LayoutBox.cpp
@@ -249,7 +249,7 @@ void LayoutBox::styleDidChange(StyleDifference diff, const ComputedStyle* oldSty
@@ -248,7 +248,7 @@ void LayoutBox::styleDidChange(StyleDifference diff, const ComputedStyle* oldSty
}
if (isDocumentElement() || isBody()) {
- document().view()->recalculateScrollbarOverlayStyle();
@@ -60,12 +61,11 @@ index 596df85..0dcaa00 100644
document().view()->recalculateCustomScrollbarStyle();
if (LayoutView* layoutView = view()) {
if (PaintLayerScrollableArea* scrollableArea = layoutView->scrollableArea()) {
if (scrollableArea->horizontalScrollbar() && scrollableArea->horizontalScrollbar()->isCustomScrollbar())
diff --git Source/core/paint/PaintLayerScrollableArea.cpp Source/core/paint/PaintLayerScrollableArea.cpp
index 0067b70..03c766c 100644
index fbca377..74eddd1 100644
--- Source/core/paint/PaintLayerScrollableArea.cpp
+++ Source/core/paint/PaintLayerScrollableArea.cpp
@@ -847,6 +847,19 @@ void PaintLayerScrollableArea::updateAfterStyleChange(const ComputedStyle* oldSt
@@ -827,6 +827,19 @@ void PaintLayerScrollableArea::updateAfterStyleChange(const ComputedStyle* oldSt
updateScrollCornerStyle();
updateResizerAreaSet();
updateResizerStyle();
@@ -85,7 +85,7 @@ index 0067b70..03c766c 100644
}
bool PaintLayerScrollableArea::updateAfterCompositingChange()
@@ -1483,9 +1496,14 @@ void PaintLayerScrollableArea::ScrollbarManager::setHasHorizontalScrollbar(bool
@@ -1463,9 +1476,14 @@ void PaintLayerScrollableArea::ScrollbarManager::setHasHorizontalScrollbar(bool
// This doesn't hit in any tests, but since the equivalent code in setHasVerticalScrollbar
// does, presumably this code does as well.
DisableCompositingQueryAsserts disabler;
@@ -102,7 +102,7 @@ index 0067b70..03c766c 100644
} else {
m_hBarIsAttached = 0;
if (!m_canDetachScrollbars)
@@ -1497,9 +1515,14 @@ void PaintLayerScrollableArea::ScrollbarManager::setHasVerticalScrollbar(bool ha
@@ -1477,9 +1495,14 @@ void PaintLayerScrollableArea::ScrollbarManager::setHasVerticalScrollbar(bool ha
{
if (hasScrollbar) {
DisableCompositingQueryAsserts disabler;
@@ -119,7 +119,7 @@ index 0067b70..03c766c 100644
} else {
m_vBarIsAttached = 0;
if (!m_canDetachScrollbars)
@@ -1520,10 +1543,6 @@ PassRefPtrWillBeRawPtr<Scrollbar> PaintLayerScrollableArea::ScrollbarManager::cr
@@ -1500,10 +1523,6 @@ PassRefPtrWillBeRawPtr<Scrollbar> PaintLayerScrollableArea::ScrollbarManager::cr
if (actualLayoutObject.styleRef().hasAppearance())
scrollbarSize = LayoutTheme::theme().scrollbarControlSizeForPart(actualLayoutObject.styleRef().appearance());
scrollbar = Scrollbar::create(m_scrollableArea.get(), orientation, scrollbarSize, &m_scrollableArea->box().frame()->page()->chromeClient());