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

BrowserClient::CanCreateWindow is no longer called on the IO thread

Browse source 
https://codereview.chromium.org/2821473002
This commit is contained in:
deepak1556 2017-12-07 09:42:38 +05:30
commit 19de41b764
3 changed files with 37 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
atom/browser/api/atom_api_app.cc
View file

@ -667,25 +667,33 @@ void App::OnLogin(LoginHandler* login_handler,
login_handler->CancelAuth(); login_handler->CancelAuth();
} }
void App::OnCreateWindow( bool App::CanCreateWindow(
content::RenderFrameHost* opener,
const GURL& opener_url,
const GURL& opener_top_level_frame_url,
const GURL& source_origin,
content::mojom::WindowContainerType container_type,
const GURL& target_url, const GURL& target_url,
const content::Referrer& referrer,
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const std::vector<std::string>& features, const blink::mojom::WindowFeatures& features,
const std::vector<std::string>& additional_features,
const scoped_refptr<content::ResourceRequestBody>& body, const scoped_refptr<content::ResourceRequestBody>& body,
content::RenderFrameHost* opener) { bool user_gesture,
bool opener_suppressed,
bool* no_javascript_access) {
v8::Locker locker(isolate()); v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate()); v8::HandleScope handle_scope(isolate());
content::WebContents* web_contents = content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(opener); content::WebContents::FromRenderFrameHost(opener);
if (web_contents) { if (web_contents) {
auto api_web_contents = WebContents::CreateFrom(isolate(), web_contents); auto api_web_contents = WebContents::CreateFrom(isolate(), web_contents);
api_web_contents->OnCreateWindow(target_url, api_web_contents->OnCreateWindow(target_url, frame_name, disposition,
frame_name, additional_features, body);
disposition,
features,
body);
} }
return false;
} }
void App::AllowCertificateError( void App::AllowCertificateError(

24
atom/browser/api/atom_api_app.h
View file

@ -75,15 +75,6 @@ class App : public AtomBrowserClient::Delegate,
static void BuildPrototype(v8::Isolate* isolate, static void BuildPrototype(v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> prototype); v8::Local<v8::FunctionTemplate> prototype);
// Called when window with disposition needs to be created.
void OnCreateWindow(
const GURL& target_url,
const std::string& frame_name,
WindowOpenDisposition disposition,
const std::vector<std::string>& features,
const scoped_refptr<content::ResourceRequestBody>& body,
content::RenderFrameHost* opener);
#if defined(USE_NSS_CERTS) #if defined(USE_NSS_CERTS)
void OnCertificateManagerModelCreated( void OnCertificateManagerModelCreated(
std::unique_ptr<base::DictionaryValue> options, std::unique_ptr<base::DictionaryValue> options,
@ -152,6 +143,21 @@ class App : public AtomBrowserClient::Delegate,
net::SSLCertRequestInfo* cert_request_info, net::SSLCertRequestInfo* cert_request_info,
net::ClientCertIdentityList client_certs, net::ClientCertIdentityList client_certs,
std::unique_ptr<content::ClientCertificateDelegate> delegate) override; std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
bool CanCreateWindow(content::RenderFrameHost* opener,
const GURL& opener_url,
const GURL& opener_top_level_frame_url,
const GURL& source_origin,
content::mojom::WindowContainerType container_type,
const GURL& target_url,
const content::Referrer& referrer,
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
const std::vector<std::string>& additional_features,
const scoped_refptr<content::ResourceRequestBody>& body,
bool user_gesture,
bool opener_suppressed,
bool* no_javascript_access) override;
// content::GpuDataManagerObserver: // content::GpuDataManagerObserver:
void OnGpuProcessCrashed(base::TerminationStatus status) override; void OnGpuProcessCrashed(base::TerminationStatus status) override;

17
atom/browser/atom_browser_client.cc
View file

@ -351,8 +351,7 @@ bool AtomBrowserClient::CanCreateWindow(
bool user_gesture, bool user_gesture,
bool opener_suppressed, bool opener_suppressed,
bool* no_javascript_access) { bool* no_javascript_access) {
// FIXME: Ensure the DCHECK doesn't fail and then re-enable DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
// DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
int opener_render_process_id = opener->GetProcess()->GetID(); int opener_render_process_id = opener->GetProcess()->GetID();
@ -373,15 +372,11 @@ bool AtomBrowserClient::CanCreateWindow(
} }
if (delegate_) { if (delegate_) {
content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, return delegate_->CanCreateWindow(
base::Bind(&api::App::OnCreateWindow, opener, opener_url, opener_top_level_frame_url, source_origin,
base::Unretained(static_cast<api::App*>(delegate_)), container_type, target_url, referrer, frame_name, disposition, features,
target_url, additional_features, body, user_gesture, opener_suppressed,
frame_name, no_javascript_access);
disposition,
additional_features,
body,
opener));
} }
return false; return false;