diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 41ad2786e..cbdb721b8 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/49.0.2623.28', + 'chromium_checkout': 'refs/tags/49.0.2623.54', } diff --git a/patch/patch.cfg b/patch/patch.cfg index cae38bc28..2932a15aa 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -246,4 +246,10 @@ patches = [ 'name': 'net_filter_515', 'path': '../net/', }, + { + # Fix Linux compile error due to EVENTS_X_EXPORT usage. + # https://bugs.chromium.org/p/chromium/issues/detail?id=589608 + 'name': 'events_x_utils', + 'path': '../ui/events/x/', + }, ] diff --git a/patch/patches/events_x_utils.patch b/patch/patches/events_x_utils.patch new file mode 100644 index 000000000..b983175b1 --- /dev/null +++ b/patch/patches/events_x_utils.patch @@ -0,0 +1,13 @@ +diff --git events_x_utils.h events_x_utils.h +index dfa821f..f918051 100644 +--- events_x_utils.h ++++ events_x_utils.h +@@ -82,7 +82,7 @@ bool GetFlingDataFromXEvent(const XEvent& xev, + float* vy_ordinal, + bool* is_cancel); + +-EVENTS_X_EXPORT void ResetTimestampRolloverCountersForTesting(); ++void ResetTimestampRolloverCountersForTesting(); + + } // namespace ui + diff --git a/patch/patches/ime_1610.patch b/patch/patches/ime_1610.patch index 3fea88932..099c6f47a 100644 --- a/patch/patches/ime_1610.patch +++ b/patch/patches/ime_1610.patch @@ -1,8 +1,8 @@ diff --git input_method_win.cc input_method_win.cc -index 56bbac1..3265c64 100644 +index 6604c6d..70981dc 100644 --- input_method_win.cc +++ input_method_win.cc -@@ -588,8 +588,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const { +@@ -586,8 +586,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const { // receiving keyboard input as long as it is an active window. This works well // even when the |attached_window_handle| becomes active but has not received // WM_FOCUS yet. diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index 9df3285e6..06e96e2bc 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -1,8 +1,8 @@ diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h -index a9811c4..a43f9d1 100644 +index e3efceb..f5b3e2f 100644 --- public/common/common_param_traits_macros.h +++ public/common/common_param_traits_macros.h -@@ -193,6 +193,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) +@@ -194,6 +194,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,10 +11,10 @@ index a9811c4..a43f9d1 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 4a83a70..98781c0 100644 +index 8ec979c..9fc043d 100644 --- public/common/web_preferences.cc +++ public/common/web_preferences.cc -@@ -171,6 +171,7 @@ WebPreferences::WebPreferences() +@@ -172,6 +172,7 @@ WebPreferences::WebPreferences() pinch_overlay_scrollbar_thickness(0), use_solid_color_scrollbars(false), navigate_on_drag_drop(true), @@ -23,10 +23,10 @@ index 4a83a70..98781c0 100644 cookie_enabled(true), pepper_accelerated_video_decode_enabled(false), diff --git public/common/web_preferences.h public/common/web_preferences.h -index de5a3c5..afdf03f 100644 +index 9926fc6..8cb6fee 100644 --- public/common/web_preferences.h +++ public/common/web_preferences.h -@@ -172,6 +172,7 @@ struct CONTENT_EXPORT WebPreferences { +@@ -173,6 +173,7 @@ struct CONTENT_EXPORT WebPreferences { int pinch_overlay_scrollbar_thickness; bool use_solid_color_scrollbars; bool navigate_on_drag_drop; @@ -35,7 +35,7 @@ index de5a3c5..afdf03f 100644 // This flags corresponds to a Page's Settings' setCookieEnabled state. It diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc -index 8e6b887..77ef5ad 100644 +index 2f80795..9eddd24 100644 --- renderer/render_view_impl.cc +++ renderer/render_view_impl.cc @@ -938,6 +938,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 3da036633..56dc1dbfc 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -12,7 +12,7 @@ index e728623..e0f051e 100644 ASSERT(RuntimeEnabledFeatures::pagePopupEnabled()); diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp -index 416f9d8..43934e3 100644 +index 8119287..c7eda0f 100644 --- Source/web/WebViewImpl.cpp +++ Source/web/WebViewImpl.cpp @@ -476,6 +476,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client) @@ -23,7 +23,7 @@ index 416f9d8..43934e3 100644 , m_doingDragAndDrop(false) , m_ignoreInputEvents(false) , m_compositorDeviceScaleFactorOverride(0) -@@ -4138,9 +4139,14 @@ void WebViewImpl::pageScaleFactorChanged() +@@ -4141,9 +4142,14 @@ void WebViewImpl::pageScaleFactorChanged() m_client->pageScaleFactorChanged(); }