mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix HasServiceWorker check

Browse source 
Revert cb2014f9e8ae0283e5f20d4e2167be1592228887.
This commit is contained in:
Tony Ganch 2017-06-21 12:34:14 +02:00 • committed by Aleksei Kuzmin
parent e2fe95894f
commit 4d9f309888
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/api/atom_api_web_contents.cc
View file

@ -1238,14 +1238,25 @@ void WebContents::InspectServiceWorker() {
} }
void WebContents::HasServiceWorker( void WebContents::HasServiceWorker(
const base::Callback<void(content::ServiceWorkerCapability)>& callback) { const base::Callback<void(bool)>& callback) {
auto context = GetServiceWorkerContext(web_contents()); auto context = GetServiceWorkerContext(web_contents());
if (!context) if (!context)
return; return;
struct WrappedCallback {
base::Callback<void(bool)> callback_;
WrappedCallback(const base::Callback<void(bool)>& callback) : callback_(callback) {}
void Run(content::ServiceWorkerCapability capability) {
callback_.Run(capability != content::ServiceWorkerCapability::NO_SERVICE_WORKER);
delete this;
}
};
auto wrapped_callback = new WrappedCallback(callback);
context->CheckHasServiceWorker(web_contents()->GetLastCommittedURL(), context->CheckHasServiceWorker(web_contents()->GetLastCommittedURL(),
GURL::EmptyGURL(), GURL::EmptyGURL(),
callback); base::Bind(&WrappedCallback::Run, base::Unretained(wrapped_callback)));
} }
void WebContents::UnregisterServiceWorker( void WebContents::UnregisterServiceWorker(

3
atom/browser/api/atom_api_web_contents.h
View file

@ -15,7 +15,6 @@
#include "atom/browser/ui/autofill_popup.h" #include "atom/browser/ui/autofill_popup.h"
#include "content/common/cursors/webcursor.h" #include "content/common/cursors/webcursor.h"
#include "content/public/browser/keyboard_event_processing_result.h" #include "content/public/browser/keyboard_event_processing_result.h"
#include "content/public/browser/service_worker_context.h"
#include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_observer.h"
#include "content/public/common/favicon_url.h" #include "content/public/common/favicon_url.h"
#include "native_mate/handle.h" #include "native_mate/handle.h"
@ -118,7 +117,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
void InspectElement(int x, int y); void InspectElement(int x, int y);
void InspectServiceWorker(); void InspectServiceWorker();
void HasServiceWorker( void HasServiceWorker(
const base::Callback<void(content::ServiceWorkerCapability)>&); const base::Callback<void(bool)>&);
void UnregisterServiceWorker(const base::Callback<void(bool)>&); void UnregisterServiceWorker(const base::Callback<void(bool)>&);
void SetIgnoreMenuShortcuts(bool ignore); void SetIgnoreMenuShortcuts(bool ignore);
void SetAudioMuted(bool muted); void SetAudioMuted(bool muted);