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

check for renderviewhost availability before using

Browse source
This commit is contained in:
deepak1556 2015-05-09 17:47:40 +05:30
parent be57151037
commit 4fe294ed04
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,20 +215,26 @@ void WebContents::HandleKeyboardEvent(
web_contents(), event); web_contents(), event);
} }
void WebContents::EnterFullscreenModeForTab(content::WebContents* web_contents, void WebContents::EnterFullscreenModeForTab(content::WebContents* source,
const GURL& origin) { const GURL& origin) {
GetWindowFromGuest(web_contents)->SetFullScreen(true); auto window = GetWindowFromGuest(source);
web_contents->GetRenderViewHost()->WasResized(); if (window) {
window->SetFullScreen(true);
source->GetRenderViewHost()->WasResized();
}
} }
void WebContents::ExitFullscreenModeForTab(content::WebContents* web_contents) { void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
GetWindowFromGuest(web_contents)->SetFullScreen(false); auto window = GetWindowFromGuest(source);
web_contents->GetRenderViewHost()->WasResized(); if (window) {
window->SetFullScreen(false);
source->GetRenderViewHost()->WasResized();
}
} }
bool WebContents::IsFullscreenForTabOrPending( bool WebContents::IsFullscreenForTabOrPending(
const content::WebContents* web_contents) const { const content::WebContents* source) const {
auto window = GetWindowFromGuest(web_contents); auto window = GetWindowFromGuest(source);
if (window) if (window)
return window->IsFullscreen(); return window->IsFullscreen();
else else

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

@ -151,11 +151,11 @@ class WebContents : public mate::EventEmitter,
void HandleKeyboardEvent( void HandleKeyboardEvent(
content::WebContents* source, content::WebContents* source,
const content::NativeWebKeyboardEvent& event) override; const content::NativeWebKeyboardEvent& event) override;
void EnterFullscreenModeForTab(content::WebContents* web_contents, void EnterFullscreenModeForTab(content::WebContents* source,
const GURL& origin) override; const GURL& origin) override;
void ExitFullscreenModeForTab(content::WebContents* web_contents) override; void ExitFullscreenModeForTab(content::WebContents* source) override;
bool IsFullscreenForTabOrPending( bool IsFullscreenForTabOrPending(
const content::WebContents* web_contents) const override; const content::WebContents* source) const override;
// content::WebContentsObserver: // content::WebContentsObserver:
void RenderViewDeleted(content::RenderViewHost*) override; void RenderViewDeleted(content::RenderViewHost*) override;