mirror of
				https://bitbucket.org/chromiumembedded/cef
				synced 2025-06-05 21:39:12 +02:00 
			
		
		
		
	Update to Chromium version 69.0.3497.81
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/69.0.3497.32', |   'chromium_checkout': 'refs/tags/69.0.3497.81', | ||||||
| } | } | ||||||
|   | |||||||
| @@ -445,10 +445,7 @@ net::NetworkDelegate::AuthRequiredResponse CefNetworkDelegate::OnAuthRequired( | |||||||
| } | } | ||||||
|  |  | ||||||
| bool CefNetworkDelegate::OnCanGetCookies(const net::URLRequest& request, | bool CefNetworkDelegate::OnCanGetCookies(const net::URLRequest& request, | ||||||
|                                          const net::CookieList& cookie_list, |                                          const net::CookieList& cookie_list) { | ||||||
|                                          bool allowed_from_caller) { |  | ||||||
|   if (!allowed_from_caller) |  | ||||||
|     return false; |  | ||||||
|   if (net_util::IsInternalRequest(&request)) |   if (net_util::IsInternalRequest(&request)) | ||||||
|     return true; |     return true; | ||||||
|  |  | ||||||
| @@ -475,10 +472,7 @@ bool CefNetworkDelegate::OnCanGetCookies(const net::URLRequest& request, | |||||||
|  |  | ||||||
| bool CefNetworkDelegate::OnCanSetCookie(const net::URLRequest& request, | bool CefNetworkDelegate::OnCanSetCookie(const net::URLRequest& request, | ||||||
|                                         const net::CanonicalCookie& cookie, |                                         const net::CanonicalCookie& cookie, | ||||||
|                                         net::CookieOptions* options, |                                         net::CookieOptions* options) { | ||||||
|                                         bool allowed_from_caller) { |  | ||||||
|   if (!allowed_from_caller) |  | ||||||
|     return false; |  | ||||||
|   if (net_util::IsInternalRequest(&request)) |   if (net_util::IsInternalRequest(&request)) | ||||||
|     return true; |     return true; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,12 +41,10 @@ class CefNetworkDelegate : public net::NetworkDelegateImpl { | |||||||
|                    bool started, |                    bool started, | ||||||
|                    int net_error) override; |                    int net_error) override; | ||||||
|   bool OnCanGetCookies(const net::URLRequest& request, |   bool OnCanGetCookies(const net::URLRequest& request, | ||||||
|                        const net::CookieList& cookie_list, |                        const net::CookieList& cookie_list) override; | ||||||
|                        bool allowed_from_caller) override; |  | ||||||
|   bool OnCanSetCookie(const net::URLRequest& request, |   bool OnCanSetCookie(const net::URLRequest& request, | ||||||
|                       const net::CanonicalCookie& cookie, |                       const net::CanonicalCookie& cookie, | ||||||
|                       net::CookieOptions* options, |                       net::CookieOptions* options) override; | ||||||
|                       bool allowed_from_caller) override; |  | ||||||
|   bool OnCanAccessFile(const net::URLRequest& request, |   bool OnCanAccessFile(const net::URLRequest& request, | ||||||
|                        const base::FilePath& original_path, |                        const base::FilePath& original_path, | ||||||
|                        const base::FilePath& absolute_path) const override; |                        const base::FilePath& absolute_path) const override; | ||||||
|   | |||||||
| @@ -266,10 +266,10 @@ index d05dd5421458..fa13775f0512 100644 | |||||||
|    // a BrowserPlugin even when we are using cross process frames for guests. It |    // a BrowserPlugin even when we are using cross process frames for guests. It | ||||||
|    // should be removed after resolving https://crbug.com/642826). |    // should be removed after resolving https://crbug.com/642826). | ||||||
| diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc | diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc | ||||||
| index 1930af130f24..77695f7844d7 100644 | index d59bfbac79cd..e5e60edf5174 100644 | ||||||
| --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc | --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc | ||||||
| +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc | +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc | ||||||
| @@ -198,6 +198,8 @@ void MimeHandlerViewGuest::CreateWebContents( | @@ -200,6 +200,8 @@ void MimeHandlerViewGuest::CreateWebContents( | ||||||
|    WebContents::CreateParams params(browser_context(), |    WebContents::CreateParams params(browser_context(), | ||||||
|                                     guest_site_instance.get()); |                                     guest_site_instance.get()); | ||||||
|    params.guest_delegate = this; |    params.guest_delegate = this; | ||||||
| @@ -278,7 +278,7 @@ index 1930af130f24..77695f7844d7 100644 | |||||||
|    // TODO(erikchen): Fix ownership semantics for guest views. |    // TODO(erikchen): Fix ownership semantics for guest views. | ||||||
|    // https://crbug.com/832879. |    // https://crbug.com/832879. | ||||||
|    std::move(callback).Run( |    std::move(callback).Run( | ||||||
| @@ -239,6 +241,18 @@ bool MimeHandlerViewGuest::ShouldDestroyOnDetach() const { | @@ -244,6 +246,18 @@ bool MimeHandlerViewGuest::ShouldDestroyOnDetach() const { | ||||||
|    return true; |    return true; | ||||||
|  } |  } | ||||||
|   |   | ||||||
|   | |||||||
| @@ -70,7 +70,7 @@ index e8e76ce5b954..1dd338dd0142 100644 | |||||||
|  content::BrowserContext* GetBrowserContextRedirectedInIncognito( |  content::BrowserContext* GetBrowserContextRedirectedInIncognito( | ||||||
|      content::BrowserContext* context); |      content::BrowserContext* context); | ||||||
| diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc | diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc | ||||||
| index be5d79034fea..617ab398fff8 100644 | index 4aa9dd926ccb..35c940b08f7d 100644 | ||||||
| --- chrome/browser/profiles/profile_manager.cc | --- chrome/browser/profiles/profile_manager.cc | ||||||
| +++ chrome/browser/profiles/profile_manager.cc | +++ chrome/browser/profiles/profile_manager.cc | ||||||
| @@ -383,7 +383,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) | @@ -383,7 +383,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) | ||||||
|   | |||||||
| @@ -285,10 +285,10 @@ index 3009401dac6b..b4c5a9e2db50 100644 | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
| diff --git content/common/frame_messages.h content/common/frame_messages.h | diff --git content/common/frame_messages.h content/common/frame_messages.h | ||||||
| index 67a66d040a08..76867658db44 100644 | index 4d0712eca8d0..ef1d88a7d42c 100644 | ||||||
| --- content/common/frame_messages.h | --- content/common/frame_messages.h | ||||||
| +++ content/common/frame_messages.h | +++ content/common/frame_messages.h | ||||||
| @@ -1382,9 +1382,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, | @@ -1379,9 +1379,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, | ||||||
|  // type. If there is no matching plugin, |found| is false. |  // type. If there is no matching plugin, |found| is false. | ||||||
|  // |actual_mime_type| is the actual mime type supported by the |  // |actual_mime_type| is the actual mime type supported by the | ||||||
|  // found plugin. |  // found plugin. | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ index 53c7404ef1f9..ac33df7cfe0e 100644 | |||||||
|    auto* browser_context = web_contents->GetBrowserContext(); |    auto* browser_context = web_contents->GetBrowserContext(); | ||||||
|    StreamsPrivateAPI* streams_private = GetStreamsPrivateAPI(browser_context); |    StreamsPrivateAPI* streams_private = GetStreamsPrivateAPI(browser_context); | ||||||
| diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc | diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc | ||||||
| index 406302b6b760..5ab2f3d7157b 100644 | index 872e4609c94f..a82e6af8a7db 100644 | ||||||
| --- content/browser/frame_host/render_frame_host_manager.cc | --- content/browser/frame_host/render_frame_host_manager.cc | ||||||
| +++ content/browser/frame_host/render_frame_host_manager.cc | +++ content/browser/frame_host/render_frame_host_manager.cc | ||||||
| @@ -928,10 +928,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( | @@ -928,10 +928,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( | ||||||
|   | |||||||
| @@ -61,11 +61,11 @@ index 39bf49c7b111..ad7b054e185f 100644 | |||||||
|    ScopedStyleContext child_context(gtk_style_context_new()); |    ScopedStyleContext child_context(gtk_style_context_new()); | ||||||
|    gtk_style_context_set_path(child_context, path); |    gtk_style_context_set_path(child_context, path); | ||||||
| diff --git chrome/browser/ui/libgtkui/native_theme_gtk2.cc chrome/browser/ui/libgtkui/native_theme_gtk2.cc | diff --git chrome/browser/ui/libgtkui/native_theme_gtk2.cc chrome/browser/ui/libgtkui/native_theme_gtk2.cc | ||||||
| index b24ff4b95f97..49e80717b1d6 100644 | index 8def6e889fa6..6f054a9b76ea 100644 | ||||||
| --- chrome/browser/ui/libgtkui/native_theme_gtk2.cc | --- chrome/browser/ui/libgtkui/native_theme_gtk2.cc | ||||||
| +++ chrome/browser/ui/libgtkui/native_theme_gtk2.cc | +++ chrome/browser/ui/libgtkui/native_theme_gtk2.cc | ||||||
| @@ -163,6 +163,8 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const { | @@ -166,6 +166,8 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const { | ||||||
|        return GetBgColor(GetMenu(), NORMAL); |        return kInvalidColorIdColor; | ||||||
|   |   | ||||||
|      // Label |      // Label | ||||||
| +    case kColorId_ActionableSubmenuVerticalSeparatorColor: | +    case kColorId_ActionableSubmenuVerticalSeparatorColor: | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| diff --git net/base/network_delegate.h net/base/network_delegate.h | diff --git net/base/network_delegate.h net/base/network_delegate.h | ||||||
| index c28d0bb3b676..1acbb4c94495 100644 | index ea4316257a61..58bf1443f1ae 100644 | ||||||
| --- net/base/network_delegate.h | --- net/base/network_delegate.h | ||||||
| +++ net/base/network_delegate.h | +++ net/base/network_delegate.h | ||||||
| @@ -17,6 +17,7 @@ | @@ -17,6 +17,7 @@ | ||||||
| @@ -10,7 +10,7 @@ index c28d0bb3b676..1acbb4c94495 100644 | |||||||
|  #include "net/proxy_resolution/proxy_retry_info.h" |  #include "net/proxy_resolution/proxy_retry_info.h" | ||||||
|   |   | ||||||
|  class GURL; |  class GURL; | ||||||
| @@ -125,6 +126,10 @@ class NET_EXPORT NetworkDelegate { | @@ -122,6 +123,10 @@ class NET_EXPORT NetworkDelegate { | ||||||
|    bool CanUseReportingClient(const url::Origin& origin, |    bool CanUseReportingClient(const url::Origin& origin, | ||||||
|                               const GURL& endpoint) const; |                               const GURL& endpoint) const; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn | diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn | ||||||
| index 4958a425d2bc..e685ce274504 100644 | index 4ef83e1a9421..ac1863275e0e 100644 | ||||||
| --- chrome/browser/ui/BUILD.gn | --- chrome/browser/ui/BUILD.gn | ||||||
| +++ chrome/browser/ui/BUILD.gn | +++ chrome/browser/ui/BUILD.gn | ||||||
| @@ -901,6 +901,7 @@ split_static_library("ui") { | @@ -901,6 +901,7 @@ split_static_library("ui") { | ||||||
|   | |||||||
| @@ -296,10 +296,10 @@ index 3cfa0bde2bca..96da49496944 100644 | |||||||
|        partition->GetPaymentAppContext(); |        partition->GetPaymentAppContext(); | ||||||
|   |   | ||||||
| diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc | diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc | ||||||
| index 45c9d093154a..f0b5346ca00c 100644 | index 05e0ee79e5ad..578d43ae8b3e 100644 | ||||||
| --- content/browser/renderer_host/render_process_host_impl.cc | --- content/browser/renderer_host/render_process_host_impl.cc | ||||||
| +++ content/browser/renderer_host/render_process_host_impl.cc | +++ content/browser/renderer_host/render_process_host_impl.cc | ||||||
| @@ -733,11 +733,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, | @@ -734,11 +734,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, | ||||||
|    // Gets the correct render process to use for this SiteInstance. |    // Gets the correct render process to use for this SiteInstance. | ||||||
|    RenderProcessHost* GetProcessHost(SiteInstance* site_instance, |    RenderProcessHost* GetProcessHost(SiteInstance* site_instance, | ||||||
|                                      bool is_for_guests_only) { |                                      bool is_for_guests_only) { | ||||||
| @@ -315,7 +315,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|   |   | ||||||
|      // Is this the default storage partition? If it isn't, then just give it its |      // Is this the default storage partition? If it isn't, then just give it its | ||||||
|      // own non-shared process. |      // own non-shared process. | ||||||
| @@ -1335,7 +1334,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { | @@ -1396,7 +1395,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { | ||||||
|  // static |  // static | ||||||
|  RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( |  RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( | ||||||
|      BrowserContext* browser_context, |      BrowserContext* browser_context, | ||||||
| @@ -324,7 +324,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|      SiteInstance* site_instance, |      SiteInstance* site_instance, | ||||||
|      bool is_for_guests_only) { |      bool is_for_guests_only) { | ||||||
|    if (g_render_process_host_factory_) { |    if (g_render_process_host_factory_) { | ||||||
| @@ -1344,8 +1343,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( | @@ -1405,8 +1404,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( | ||||||
|    } |    } | ||||||
|   |   | ||||||
|    if (!storage_partition_impl) { |    if (!storage_partition_impl) { | ||||||
| @@ -335,7 +335,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|    } |    } | ||||||
|    // If we've made a StoragePartition for guests (e.g., for the <webview> tag), |    // If we've made a StoragePartition for guests (e.g., for the <webview> tag), | ||||||
|    // stash the Site URL on it. This way, when we start a service worker inside |    // stash the Site URL on it. This way, when we start a service worker inside | ||||||
| @@ -1370,7 +1369,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = | @@ -1431,7 +1430,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = | ||||||
|   |   | ||||||
|  RenderProcessHostImpl::RenderProcessHostImpl( |  RenderProcessHostImpl::RenderProcessHostImpl( | ||||||
|      BrowserContext* browser_context, |      BrowserContext* browser_context, | ||||||
| @@ -344,7 +344,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|      bool is_for_guests_only) |      bool is_for_guests_only) | ||||||
|      : fast_shutdown_started_(false), |      : fast_shutdown_started_(false), | ||||||
|        deleting_soon_(false), |        deleting_soon_(false), | ||||||
| @@ -1403,10 +1402,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( | @@ -1483,10 +1482,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( | ||||||
|        indexed_db_factory_(new IndexedDBDispatcherHost( |        indexed_db_factory_(new IndexedDBDispatcherHost( | ||||||
|            id_, |            id_, | ||||||
|            storage_partition_impl_->GetURLRequestContext(), |            storage_partition_impl_->GetURLRequestContext(), | ||||||
| @@ -359,7 +359,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|            id_)), |            id_)), | ||||||
|        channel_connected_(false), |        channel_connected_(false), | ||||||
|        sent_render_process_ready_(false), |        sent_render_process_ready_(false), | ||||||
| @@ -1441,7 +1442,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( | @@ -1521,7 +1522,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( | ||||||
|    } |    } | ||||||
|   |   | ||||||
|    push_messaging_manager_.reset(new PushMessagingManager( |    push_messaging_manager_.reset(new PushMessagingManager( | ||||||
| @@ -369,7 +369,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|   |   | ||||||
|    AddObserver(indexed_db_factory_.get()); |    AddObserver(indexed_db_factory_.get()); | ||||||
|    AddObserver(service_worker_dispatcher_host_.get()); |    AddObserver(service_worker_dispatcher_host_.get()); | ||||||
| @@ -1774,6 +1776,17 @@ void RenderProcessHostImpl::ResetChannelProxy() { | @@ -1854,6 +1856,17 @@ void RenderProcessHostImpl::ResetChannelProxy() { | ||||||
|   |   | ||||||
|  void RenderProcessHostImpl::CreateMessageFilters() { |  void RenderProcessHostImpl::CreateMessageFilters() { | ||||||
|    DCHECK_CURRENTLY_ON(BrowserThread::UI); |    DCHECK_CURRENTLY_ON(BrowserThread::UI); | ||||||
| @@ -387,7 +387,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|    MediaInternals* media_internals = MediaInternals::GetInstance(); |    MediaInternals* media_internals = MediaInternals::GetInstance(); | ||||||
|    // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages |    // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages | ||||||
|    // from guests. |    // from guests. | ||||||
| @@ -1786,7 +1799,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { | @@ -1866,7 +1879,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { | ||||||
|        base::MakeRefCounted<RenderMessageFilter>( |        base::MakeRefCounted<RenderMessageFilter>( | ||||||
|            GetID(), GetBrowserContext(), request_context.get(), |            GetID(), GetBrowserContext(), request_context.get(), | ||||||
|            widget_helper_.get(), media_internals, |            widget_helper_.get(), media_internals, | ||||||
| @@ -396,7 +396,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|    AddFilter(render_message_filter.get()); |    AddFilter(render_message_filter.get()); | ||||||
|   |   | ||||||
|    render_frame_message_filter_ = new RenderFrameMessageFilter( |    render_frame_message_filter_ = new RenderFrameMessageFilter( | ||||||
| @@ -1813,10 +1826,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { | @@ -1893,10 +1906,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { | ||||||
|        ChromeBlobStorageContext::GetFor(browser_context); |        ChromeBlobStorageContext::GetFor(browser_context); | ||||||
|   |   | ||||||
|    resource_message_filter_ = new ResourceMessageFilter( |    resource_message_filter_ = new ResourceMessageFilter( | ||||||
| @@ -409,7 +409,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|        storage_partition_impl_->GetPrefetchURLLoaderService(), |        storage_partition_impl_->GetPrefetchURLLoaderService(), | ||||||
|        std::move(get_contexts_callback), |        std::move(get_contexts_callback), | ||||||
|        BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |        BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | ||||||
| @@ -1825,8 +1838,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { | @@ -1905,8 +1918,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { | ||||||
|   |   | ||||||
|    AddFilter( |    AddFilter( | ||||||
|        new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service())); |        new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service())); | ||||||
| @@ -419,7 +419,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|   |   | ||||||
|    peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID()); |    peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID()); | ||||||
|    AddFilter(peer_connection_tracker_host_.get()); |    AddFilter(peer_connection_tracker_host_.get()); | ||||||
| @@ -1848,10 +1860,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { | @@ -1928,10 +1940,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { | ||||||
|   |   | ||||||
|    AddFilter(new TraceMessageFilter(GetID())); |    AddFilter(new TraceMessageFilter(GetID())); | ||||||
|    AddFilter(new ResolveProxyMsgHelper(request_context.get())); |    AddFilter(new ResolveProxyMsgHelper(request_context.get())); | ||||||
| @@ -430,7 +430,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|  } |  } | ||||||
|   |   | ||||||
|  void RenderProcessHostImpl::BindCacheStorage( |  void RenderProcessHostImpl::BindCacheStorage( | ||||||
| @@ -1863,7 +1871,8 @@ void RenderProcessHostImpl::BindCacheStorage( | @@ -1943,7 +1951,8 @@ void RenderProcessHostImpl::BindCacheStorage( | ||||||
|      cache_storage_dispatcher_host_ = |      cache_storage_dispatcher_host_ = | ||||||
|          base::MakeRefCounted<CacheStorageDispatcherHost>(); |          base::MakeRefCounted<CacheStorageDispatcherHost>(); | ||||||
|      cache_storage_dispatcher_host_->Init( |      cache_storage_dispatcher_host_->Init( | ||||||
| @@ -440,7 +440,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|    } |    } | ||||||
|    // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO |    // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO | ||||||
|    // thread entirely. |    // thread entirely. | ||||||
| @@ -2013,7 +2022,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { | @@ -2093,7 +2102,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { | ||||||
|   |   | ||||||
|    registry->AddInterface(base::BindRepeating( |    registry->AddInterface(base::BindRepeating( | ||||||
|        &AppCacheDispatcherHost::Create, |        &AppCacheDispatcherHost::Create, | ||||||
| @@ -450,7 +450,7 @@ index 45c9d093154a..f0b5346ca00c 100644 | |||||||
|        GetID())); |        GetID())); | ||||||
|   |   | ||||||
|    AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create)); |    AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create)); | ||||||
| @@ -2044,6 +2054,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { | @@ -2124,6 +2134,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { | ||||||
|      plugin_registry_.reset( |      plugin_registry_.reset( | ||||||
|          new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); |          new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); | ||||||
|    } |    } | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc | diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc | ||||||
| index c61199d5dd8f..f2c19e4e5f3c 100644 | index 5561b7a1f386..929d799fc696 100644 | ||||||
| --- content/browser/renderer_host/render_widget_host_view_base.cc | --- content/browser/renderer_host/render_widget_host_view_base.cc | ||||||
| +++ content/browser/renderer_host/render_widget_host_view_base.cc | +++ content/browser/renderer_host/render_widget_host_view_base.cc | ||||||
| @@ -480,6 +480,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const { | @@ -480,6 +480,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const { | ||||||
| @@ -427,7 +427,7 @@ index c7296fed234d..244d0034a1c4 100644 | |||||||
|        if (native_widget_delegate->IsDialogBox()) { |        if (native_widget_delegate->IsDialogBox()) { | ||||||
|          *style |= DS_MODALFRAME; |          *style |= DS_MODALFRAME; | ||||||
| diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc | diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc | ||||||
| index 4b7af541276d..8269cb4990f3 100644 | index d5f442f71da7..1343399efbb8 100644 | ||||||
| --- ui/views/win/hwnd_message_handler.cc | --- ui/views/win/hwnd_message_handler.cc | ||||||
| +++ ui/views/win/hwnd_message_handler.cc | +++ ui/views/win/hwnd_message_handler.cc | ||||||
| @@ -2872,10 +2872,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, | @@ -2872,10 +2872,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd | diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd | ||||||
| index 26959103adcf..c7fba17fa97f 100644 | index b68d4210285c..71a7956c5da1 100644 | ||||||
| --- chrome/app/generated_resources.grd | --- chrome/app/generated_resources.grd | ||||||
| +++ chrome/app/generated_resources.grd | +++ chrome/app/generated_resources.grd | ||||||
| @@ -4457,7 +4457,7 @@ Keep your key file in a safe place. You will need it to create new versions of y | @@ -4457,7 +4457,7 @@ Keep your key file in a safe place. You will need it to create new versions of y | ||||||
|   | |||||||
| @@ -200,8 +200,6 @@ class AccessibilityTestHandler : public TestHandler, | |||||||
|       EXPECT_EQ(VTYPE_LIST, value->GetType()); |       EXPECT_EQ(VTYPE_LIST, value->GetType()); | ||||||
|       CefRefPtr<CefListValue> list = value->GetList(); |       CefRefPtr<CefListValue> list = value->GetList(); | ||||||
|       EXPECT_TRUE(list.get()); |       EXPECT_TRUE(list.get()); | ||||||
|       // Always empty events after https://crrev.com/c101cb728a. |  | ||||||
|       EXPECT_EQ(0U, list->GetSize()); |  | ||||||
|  |  | ||||||
|       got_accessibility_location_change_.yes(); |       got_accessibility_location_change_.yes(); | ||||||
|     } |     } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user