diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index f9bf51879..ac3a34865 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'd483fb7716e28b377c70c26c1bf1e3695aa1d8c9', + 'chromium_checkout': 'refs/tags/60.0.3112.10', } diff --git a/libcef/browser/views/view_view.h b/libcef/browser/views/view_view.h index 3610c2247..57c7200ec 100644 --- a/libcef/browser/views/view_view.h +++ b/libcef/browser/views/view_view.h @@ -63,7 +63,7 @@ CEF_VIEW_VIEW_T class CefViewView : public ViewsViewClass { } // views::View methods: - gfx::Size GetPreferredSize() const override; + gfx::Size CalculatePreferredSize() const override; gfx::Size GetMinimumSize() const override; gfx::Size GetMaximumSize() const override; int GetHeightForWidth(int w) const override; @@ -87,7 +87,7 @@ CEF_VIEW_VIEW_T class CefViewView : public ViewsViewClass { CefViewDelegateClass* cef_delegate_; }; -CEF_VIEW_VIEW_T gfx::Size CEF_VIEW_VIEW_D::GetPreferredSize() const { +CEF_VIEW_VIEW_T gfx::Size CEF_VIEW_VIEW_D::CalculatePreferredSize() const { gfx::Size result; if (cef_delegate()) { CefSize cef_size = cef_delegate()->GetPreferredSize(GetCefView()); @@ -95,7 +95,7 @@ CEF_VIEW_VIEW_T gfx::Size CEF_VIEW_VIEW_D::GetPreferredSize() const { result = gfx::Size(cef_size.width, cef_size.height); } if (result.IsEmpty()) - result = ParentClass::GetPreferredSize(); + result = ParentClass::CalculatePreferredSize(); if (result.IsEmpty()) { // Some layouts like BoxLayout expect the preferred size to be non-empty. // The user may have set the size explicitly. Therefore return the current diff --git a/libcef/browser/views/window_view.cc b/libcef/browser/views/window_view.cc index 094536c69..b332cf832 100644 --- a/libcef/browser/views/window_view.cc +++ b/libcef/browser/views/window_view.cc @@ -176,7 +176,7 @@ class CaptionlessFrameView : public views::NonClientFrameView { client_view_bounds_.SetRect(0, 0, width(), height()); } - gfx::Size GetPreferredSize() const override { + gfx::Size CalculatePreferredSize() const override { return widget_->non_client_view() ->GetWindowBoundsForClientBounds( gfx::Rect(widget_->client_view()->GetPreferredSize())) diff --git a/patch/patch.cfg b/patch/patch.cfg index 231263370..d3105cbf9 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -298,9 +298,4 @@ patches = [ # https://bitbucket.org/chromiumembedded/cef/issues/2015 'name': 'webkit_plugin_info_2015', }, - { - # Windows: Fix AssertIOAllowed failure in NetworkChangeNotifier. - # https://bugs.chromium.org/p/chromium/issues/detail?id=721461 - 'name': 'network_change_721461', - }, ] diff --git a/patch/patches/content_1129_2015.patch b/patch/patches/content_1129_2015.patch index 495bd86e5..8b4ec3ecc 100644 --- a/patch/patches/content_1129_2015.patch +++ b/patch/patches/content_1129_2015.patch @@ -95,7 +95,7 @@ index 7563fdf..d4e0a38 100644 } diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc -index 2bdb04d..b28722e 100644 +index 55f8a8b..5020178 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc @@ -865,10 +865,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { @@ -117,7 +117,7 @@ index 2bdb04d..b28722e 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -2573,14 +2572,12 @@ void RenderFrameHostImpl::OnHidePopup() { +@@ -2578,14 +2577,12 @@ void RenderFrameHostImpl::OnHidePopup() { } #endif diff --git a/patch/patches/net_security_expiration_1994.patch b/patch/patches/net_security_expiration_1994.patch index 7d6a31822..e3821b25c 100644 --- a/patch/patches/net_security_expiration_1994.patch +++ b/patch/patches/net_security_expiration_1994.patch @@ -55,11 +55,11 @@ index 7111970..f751d6c 100644 } // namespace net diff --git net/http/transport_security_state.cc net/http/transport_security_state.cc -index e838cbe..d2f6f0f 100644 +index 3971eb3..fa4df80 100644 --- net/http/transport_security_state.cc +++ net/http/transport_security_state.cc -@@ -1537,8 +1537,10 @@ void TransportSecurityState::ClearReportCachesForTesting() { - sent_expect_ct_reports_cache_.Clear(); +@@ -1504,8 +1504,10 @@ void TransportSecurityState::SetShouldRequireCTForTesting(bool* required) { + g_ct_required_for_testing = *required ? 1 : -1; } -// static @@ -72,12 +72,12 @@ index e838cbe..d2f6f0f 100644 // We consider built-in information to be timely for 10 weeks. return (base::Time::Now() - build_time).InDays() < 70 /* 10 weeks */; diff --git net/http/transport_security_state.h net/http/transport_security_state.h -index 19ba839..a0b9810 100644 +index 7ce883a..80b1ae0 100644 --- net/http/transport_security_state.h +++ net/http/transport_security_state.h -@@ -576,6 +576,10 @@ class NET_EXPORT TransportSecurityState - // Expect-CT reports. - void ClearReportCachesForTesting(); +@@ -572,6 +572,10 @@ class NET_EXPORT TransportSecurityState + // unless a RequireCTDelegate overrides). Set to nullptr to reset. + static void SetShouldRequireCTForTesting(bool* required); + void set_enforce_net_security_expiration(bool enforce) { + enforce_net_security_expiration_ = enforce; @@ -86,7 +86,7 @@ index 19ba839..a0b9810 100644 private: friend class TransportSecurityStateTest; friend class TransportSecurityStateStaticFuzzer; -@@ -596,7 +600,7 @@ class NET_EXPORT TransportSecurityState +@@ -587,7 +591,7 @@ class NET_EXPORT TransportSecurityState // IsBuildTimely returns true if the current build is new enough ensure that // built in security information (i.e. HSTS preloading and pinning // information) is timely. @@ -95,7 +95,7 @@ index 19ba839..a0b9810 100644 // Helper method for actually checking pins. PKPStatus CheckPublicKeyPinsImpl( -@@ -704,6 +708,8 @@ class NET_EXPORT TransportSecurityState +@@ -687,6 +691,8 @@ class NET_EXPORT TransportSecurityState // True if public key pinning bypass is enabled for local trust anchors. bool enable_pkp_bypass_for_local_trust_anchors_; diff --git a/patch/patches/network_change_721461.patch b/patch/patches/network_change_721461.patch deleted file mode 100644 index 810a191b4..000000000 --- a/patch/patches/network_change_721461.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git net/base/network_change_notifier_win.cc net/base/network_change_notifier_win.cc -index 9b2b35e..1dc2038 100644 ---- net/base/network_change_notifier_win.cc -+++ net/base/network_change_notifier_win.cc -@@ -14,6 +14,7 @@ - #include "base/message_loop/message_loop.h" - #include "base/metrics/histogram_macros.h" - #include "base/single_thread_task_runner.h" -+#include "base/task_runner_util.h" - #include "base/threading/thread.h" - #include "base/threading/thread_task_runner_handle.h" - #include "base/time/time.h" -@@ -136,8 +137,6 @@ NetworkChangeNotifierWin::NetworkChangeCalculatorParamsWin() { - // - NetworkChangeNotifier::ConnectionType - NetworkChangeNotifierWin::RecomputeCurrentConnectionType() const { -- DCHECK(CalledOnValidThread()); -- - EnsureWinsockInit(); - - // The following code was adapted from: -@@ -205,6 +204,18 @@ NetworkChangeNotifierWin::RecomputeCurrentConnectionType() const { - : NetworkChangeNotifier::CONNECTION_NONE; - } - -+void NetworkChangeNotifierWin::RecomputeCurrentConnectionTypeOnDnsThread( -+ base::Callback reply_callback) const { -+ // Unretained is safe in this call because this object owns the thread and the -+ // thread is stopped in this object's destructor. -+ base::PostTaskAndReplyWithResult( -+ dns_config_service_thread_->message_loop()->task_runner().get(), -+ FROM_HERE, -+ base::Bind(&NetworkChangeNotifierWin::RecomputeCurrentConnectionType, -+ base::Unretained(this)), -+ reply_callback); -+} -+ - NetworkChangeNotifier::ConnectionType - NetworkChangeNotifierWin::GetCurrentConnectionType() const { - base::AutoLock auto_lock(last_computed_connection_type_lock_); -@@ -225,12 +236,13 @@ void NetworkChangeNotifierWin::OnObjectSignaled(HANDLE object) { - // Start watching for the next address change. - WatchForAddressChange(); - -- NotifyObservers(); -+ RecomputeCurrentConnectionTypeOnDnsThread(base::Bind( -+ &NetworkChangeNotifierWin::NotifyObservers, weak_factory_.GetWeakPtr())); - } - --void NetworkChangeNotifierWin::NotifyObservers() { -+void NetworkChangeNotifierWin::NotifyObservers(ConnectionType connection_type) { - DCHECK(CalledOnValidThread()); -- SetCurrentConnectionType(RecomputeCurrentConnectionType()); -+ SetCurrentConnectionType(connection_type); - NotifyObserversOfIPAddressChange(); - - // Calling GetConnectionType() at this very moment is likely to give -@@ -274,8 +286,11 @@ void NetworkChangeNotifierWin::WatchForAddressChange() { - // Treat the transition from NotifyAddrChange failing to succeeding as a - // network change event, since network changes were not being observed in - // that interval. -- if (sequential_failures_ > 0) -- NotifyObservers(); -+ if (sequential_failures_ > 0) { -+ RecomputeCurrentConnectionTypeOnDnsThread( -+ base::Bind(&NetworkChangeNotifierWin::NotifyObservers, -+ weak_factory_.GetWeakPtr())); -+ } - - if (sequential_failures_ < 2000) { - UMA_HISTOGRAM_COUNTS_10000("Net.NotifyAddrChangeFailures", -@@ -305,7 +320,14 @@ bool NetworkChangeNotifierWin::WatchForAddressChangeInternal() { - } - - void NetworkChangeNotifierWin::NotifyParentOfConnectionTypeChange() { -- SetCurrentConnectionType(RecomputeCurrentConnectionType()); -+ RecomputeCurrentConnectionTypeOnDnsThread(base::Bind( -+ &NetworkChangeNotifierWin::NotifyParentOfConnectionTypeChangeImpl, -+ weak_factory_.GetWeakPtr())); -+} -+ -+void NetworkChangeNotifierWin::NotifyParentOfConnectionTypeChangeImpl( -+ ConnectionType connection_type) { -+ SetCurrentConnectionType(connection_type); - bool current_offline = IsOffline(); - offline_polls_++; - // If we continue to appear offline, delay sending out the notification in -@@ -323,10 +345,10 @@ void NetworkChangeNotifierWin::NotifyParentOfConnectionTypeChange() { - - NotifyObserversOfConnectionTypeChange(); - double max_bandwidth_mbps = 0.0; -- ConnectionType connection_type = CONNECTION_NONE; -+ ConnectionType max_connection_type = CONNECTION_NONE; - GetCurrentMaxBandwidthAndConnectionType(&max_bandwidth_mbps, -- &connection_type); -- NotifyObserversOfMaxBandwidthChange(max_bandwidth_mbps, connection_type); -+ &max_connection_type); -+ NotifyObserversOfMaxBandwidthChange(max_bandwidth_mbps, max_connection_type); - } - - } // namespace net -diff --git net/base/network_change_notifier_win.h net/base/network_change_notifier_win.h -index 94bab7f..6871499 100644 ---- net/base/network_change_notifier_win.h -+++ net/base/network_change_notifier_win.h -@@ -9,6 +9,7 @@ - - #include - -+#include "base/callback.h" - #include "base/compiler_specific.h" - #include "base/macros.h" - #include "base/memory/weak_ptr.h" -@@ -62,15 +63,21 @@ class NET_EXPORT_PRIVATE NetworkChangeNotifierWin - // It is not thread safe, see crbug.com/324913. - virtual ConnectionType RecomputeCurrentConnectionType() const; - -+ // Calls RecomputeCurrentConnectionTypeImpl on the DNS thread and runs -+ // |reply_callback| with the type on the calling thread. -+ virtual void RecomputeCurrentConnectionTypeOnDnsThread( -+ base::Callback reply_callback) const; -+ - void SetCurrentConnectionType(ConnectionType connection_type); - - // Notifies IP address change observers of a change immediately, and notifies - // network state change observers on a delay. Must only be called on the - // thread |this| was created on. -- void NotifyObservers(); -+ void NotifyObservers(ConnectionType connection_type); - - // Forwards connection type notifications to parent class. - void NotifyParentOfConnectionTypeChange(); -+ void NotifyParentOfConnectionTypeChangeImpl(ConnectionType connection_type); - - // Tries to start listening for a single subsequent address change. Returns - // false on failure. The caller is responsible for updating |is_watching_|. diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index 447ee19df..bc5e78e6d 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -1,8 +1,8 @@ diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h -index 5ff2bb0..a1a62f2 100644 +index 3220d59..f0fa24c 100644 --- content/public/common/common_param_traits_macros.h +++ content/public/common/common_param_traits_macros.h -@@ -205,6 +205,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) +@@ -206,6 +206,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) @@ -23,10 +23,10 @@ index 1e00ba5..d829b4f 100644 inert_visual_viewport(false), record_whole_document(false), diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h -index 80816ae..46de601 100644 +index 41f7a69..d04e476 100644 --- content/public/common/web_preferences.h +++ content/public/common/web_preferences.h -@@ -190,6 +190,7 @@ struct CONTENT_EXPORT WebPreferences { +@@ -191,6 +191,7 @@ struct CONTENT_EXPORT WebPreferences { bool spatial_navigation_enabled; bool use_solid_color_scrollbars; bool navigate_on_drag_drop; @@ -35,10 +35,10 @@ index 80816ae..46de601 100644 bool inert_visual_viewport; bool record_whole_document; diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc -index de3e891..d703c8e 100644 +index 48b7bc0..f4d9b48 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc -@@ -1396,6 +1396,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( +@@ -1399,6 +1399,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( blink::WebView* web_view, CompositorDependencies* compositor_deps) { ApplyWebPreferences(prefs, web_view); diff --git a/patch/patches/service_manager_654986.patch b/patch/patches/service_manager_654986.patch index e68808b69..2412d73c3 100644 --- a/patch/patches/service_manager_654986.patch +++ b/patch/patches/service_manager_654986.patch @@ -1,5 +1,5 @@ diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc -index e661492..8a282fd 100644 +index e661492..b3c0296 100644 --- services/service_manager/embedder/main.cc +++ services/service_manager/embedder/main.cc @@ -325,13 +325,30 @@ int RunService(MainDelegate* delegate) { @@ -95,7 +95,7 @@ index e661492..8a282fd 100644 if (tracker) { if (exit_code == 0) { tracker->SetProcessPhaseIfEnabled( -@@ -481,14 +494,39 @@ int Main(const MainParams& params) { +@@ -481,13 +494,38 @@ int Main(const MainParams& params) { } } @@ -117,7 +117,6 @@ index e661492..8a282fd 100644 delegate->ShutDownEmbedderProcess(); +} -- return exit_code; +int Main(MainParams& params) { +#if defined(OS_MACOSX) + // We need this pool for all the objects created before we get to the event @@ -133,10 +132,9 @@ index e661492..8a282fd 100644 + return exit_code; + exit_code = MainRun(params); + MainShutdown(params); -+ return exit_code; + return exit_code; } - } // namespace service_manager diff --git services/service_manager/embedder/main.h services/service_manager/embedder/main.h index e86697a..771acd8 100644 --- services/service_manager/embedder/main.h diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index d58043850..0a0151c0c 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -152,7 +152,7 @@ index 73f3cba..55d488b 100644 BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index ec0d400..49261d1 100644 +index cbd667c..c0158c9 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -482,7 +482,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -346,7 +346,7 @@ index ec0d400..49261d1 100644 if (!GetWorkerRefCount()) return; service_worker_ref_count_ = 0; -@@ -3064,8 +3083,8 @@ RenderProcessHost* RenderProcessHostImpl::GetProcessHostForSiteInstance( +@@ -3065,8 +3084,8 @@ RenderProcessHost* RenderProcessHostImpl::GetProcessHostForSiteInstance( g_render_process_host_factory_->CreateRenderProcessHost( browser_context, site_instance); } else { diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index cb4b1023d..446e566ca 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -115,10 +115,10 @@ index 68e5b60..3861921 100644 class InkDropGestureHandler; friend class InkDropGestureHandler; diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc -index aa8dae7..05c89b3 100644 +index f049ca8..23bc0bd 100644 --- ui/views/controls/button/label_button.cc +++ ui/views/controls/button/label_button.cc -@@ -192,6 +192,7 @@ gfx::Size LabelButton::GetPreferredSize() const { +@@ -192,6 +192,7 @@ gfx::Size LabelButton::CalculatePreferredSize() const { Label label(GetText(), {label_->font_list()}); label.SetLineHeight(label_->line_height()); label.SetShadows(label_->shadows()); @@ -139,7 +139,7 @@ index aa8dae7..05c89b3 100644 const gfx::Size previous_image_size(image_->GetPreferredSize()); UpdateImage(); diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h -index 8495c43..da7997e 100644 +index a608594..fadd999 100644 --- ui/views/controls/button/label_button.h +++ ui/views/controls/button/label_button.h @@ -109,6 +109,9 @@ class VIEWS_EXPORT LabelButton : public CustomButton, @@ -153,12 +153,12 @@ index 8495c43..da7997e 100644 ImageView* image() const { return image_; } Label* label() const { return label_; } diff --git ui/views/controls/button/menu_button.cc ui/views/controls/button/menu_button.cc -index 33740d8..42c4cbc 100644 +index 74188e4..541397e 100644 --- ui/views/controls/button/menu_button.cc +++ ui/views/controls/button/menu_button.cc @@ -194,7 +194,7 @@ void MenuButton::OnPaint(gfx::Canvas* canvas) { - gfx::Size MenuButton::GetPreferredSize() const { - gfx::Size prefsize = LabelButton::GetPreferredSize(); + gfx::Size MenuButton::CalculatePreferredSize() const { + gfx::Size prefsize = LabelButton::CalculatePreferredSize(); if (show_menu_marker_) { - prefsize.Enlarge(menu_marker_->width() + kMenuMarkerPaddingLeft + + prefsize.Enlarge(menu_marker_->width() + GetMarkerPaddingLeft() + @@ -186,7 +186,7 @@ index 33740d8..42c4cbc 100644 + } // namespace views diff --git ui/views/controls/button/menu_button.h ui/views/controls/button/menu_button.h -index 0d87c31..bcaa1ec 100644 +index 0d4af71..6c70762 100644 --- ui/views/controls/button/menu_button.h +++ ui/views/controls/button/menu_button.h @@ -57,6 +57,9 @@ class VIEWS_EXPORT MenuButton : public LabelButton { @@ -210,7 +210,7 @@ index 0d87c31..bcaa1ec 100644 // The time is used for simulating menu behavior for the menu button; that // is, if the menu is shown and the button is pressed, we need to close the diff --git ui/views/controls/label.cc ui/views/controls/label.cc -index 2523f9a..ef64aac 100644 +index c5e3fc5..753bbf5 100644 --- ui/views/controls/label.cc +++ ui/views/controls/label.cc @@ -26,6 +26,7 @@ @@ -280,7 +280,7 @@ index 2523f9a..ef64aac 100644 } diff --git ui/views/controls/label.h ui/views/controls/label.h -index 0fa4db8..6d48a9b 100644 +index 0881558..be413f3 100644 --- ui/views/controls/label.h +++ ui/views/controls/label.h @@ -144,6 +144,10 @@ class VIEWS_EXPORT Label : public View, @@ -381,7 +381,7 @@ index 4dea63f..ef50b71 100644 virtual int GetMaxWidthForMenu(MenuItemView* menu); diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc -index c2d98e2..8d12a05 100644 +index 5b15552..5c0fdbe 100644 --- ui/views/controls/menu/menu_item_view.cc +++ ui/views/controls/menu/menu_item_view.cc @@ -761,7 +761,12 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) { @@ -520,7 +520,7 @@ index 0ac493c..741769e 100644 void WillHideMenu(MenuItemView* menu) override; void OnMenuClosed(MenuItemView* menu) override; diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc -index 124442a..c5cfe8b 100644 +index a0a74eb..cf2044b 100644 --- ui/views/controls/menu/menu_scroll_view_container.cc +++ ui/views/controls/menu/menu_scroll_view_container.cc @@ -184,6 +184,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) @@ -551,7 +551,7 @@ index 117a268..6065c73 100644 // Move the cursor because EnterNotify/LeaveNotify are generated with the // current mouse position as a result of XGrabPointer() diff --git ui/views/view.h ui/views/view.h -index 410e2a5..0ba4765 100644 +index 9c78e19..8e03434 100644 --- ui/views/view.h +++ ui/views/view.h @@ -18,6 +18,7 @@ diff --git a/patch/patches/views_widget_180_1481_1565_1677_1749.patch b/patch/patches/views_widget_180_1481_1565_1677_1749.patch index 47ceb3a65..afc76db88 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc -index 527e5ea..de52a1e 100644 +index 98460d7..ffbfa04f 100644 --- content/browser/renderer_host/render_widget_host_view_base.cc +++ content/browser/renderer_host/render_widget_host_view_base.cc -@@ -299,6 +299,14 @@ void RenderWidgetHostViewBase::FocusedNodeTouched( +@@ -298,6 +298,14 @@ void RenderWidgetHostViewBase::FocusedNodeTouched( DVLOG(1) << "FocusedNodeTouched: " << editable; } diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 527ef4d7d..7d1fe8674 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -25,10 +25,10 @@ index 2a35f2c..dded520 100644 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); diff --git third_party/WebKit/Source/web/WebViewImpl.cpp third_party/WebKit/Source/web/WebViewImpl.cpp -index dccdd58..a2a7ab9 100644 +index a8985f8..2cf5913 100644 --- third_party/WebKit/Source/web/WebViewImpl.cpp +++ third_party/WebKit/Source/web/WebViewImpl.cpp -@@ -355,6 +355,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, +@@ -353,6 +353,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, enable_fake_page_scale_animation_for_testing_(false), fake_page_scale_animation_page_scale_factor_(0), fake_page_scale_animation_use_anchor_(false), @@ -36,7 +36,7 @@ index dccdd58..a2a7ab9 100644 compositor_device_scale_factor_override_(0), suppress_next_keypress_event_(false), ime_accept_events_(true), -@@ -3693,12 +3694,13 @@ void WebViewImpl::MainFrameScrollOffsetChanged() { +@@ -3689,12 +3690,13 @@ void WebViewImpl::MainFrameScrollOffsetChanged() { dev_tools_emulator_->MainFrameScrollOrScaleChanged(); } @@ -55,7 +55,7 @@ index dccdd58..a2a7ab9 100644 void WebViewImpl::SetBackgroundColorOverride(WebColor color) { diff --git third_party/WebKit/Source/web/WebViewImpl.h third_party/WebKit/Source/web/WebViewImpl.h -index ba65d8f..490e451 100644 +index 591da9f..df2c787 100644 --- third_party/WebKit/Source/web/WebViewImpl.h +++ third_party/WebKit/Source/web/WebViewImpl.h @@ -357,7 +357,8 @@ class WEB_EXPORT WebViewImpl final @@ -78,10 +78,10 @@ index ba65d8f..490e451 100644 TransformationMatrix device_emulation_transform_; diff --git third_party/WebKit/public/web/WebView.h third_party/WebKit/public/web/WebView.h -index c55118b..56d8896 100644 +index e790df6..4e57f29 100644 --- third_party/WebKit/public/web/WebView.h +++ third_party/WebKit/public/web/WebView.h -@@ -399,6 +399,7 @@ class WebView : protected WebWidget { +@@ -398,6 +398,7 @@ class WebView : protected WebWidget { // Sets whether select popup menus should be rendered by the browser. BLINK_EXPORT static void SetUseExternalPopupMenus(bool);