bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check that platform_delegate_ is non-NULL

This commit is contained in:
Marshall Greenblatt 2016-08-15 12:30:17 +03:00
parent aa950f8bdb
commit 4f0ba755c6
1 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
libcef/browser/browser_host_impl.cc
View File

@ -598,7 +598,7 @@ void CefBrowserHostImpl::SetFocus(bool focus) {
if (focus) if (focus)
OnSetFocus(FOCUS_SOURCE_SYSTEM); OnSetFocus(FOCUS_SOURCE_SYSTEM);
else else if (platform_delegate_)
platform_delegate_->SendFocusEvent(false); platform_delegate_->SendFocusEvent(false);
} }
@ -942,7 +942,7 @@ void CefBrowserHostImpl::WasResized() {
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->WasResized(); platform_delegate_->WasResized();
@ -960,7 +960,7 @@ void CefBrowserHostImpl::WasHidden(bool hidden) {
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->WasHidden(hidden); platform_delegate_->WasHidden(hidden);
@ -978,7 +978,7 @@ void CefBrowserHostImpl::NotifyScreenInfoChanged() {
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->NotifyScreenInfoChanged(); platform_delegate_->NotifyScreenInfoChanged();
@ -996,7 +996,7 @@ void CefBrowserHostImpl::Invalidate(PaintElementType type) {
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->Invalidate(type); platform_delegate_->Invalidate(type);
@ -1009,7 +1009,7 @@ void CefBrowserHostImpl::SendKeyEvent(const CefKeyEvent& event) {
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
content::NativeWebKeyboardEvent web_event; content::NativeWebKeyboardEvent web_event;
@ -1026,7 +1026,7 @@ void CefBrowserHostImpl::SendMouseClickEvent(const CefMouseEvent& event,
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
blink::WebMouseEvent web_event; blink::WebMouseEvent web_event;
@ -1044,7 +1044,7 @@ void CefBrowserHostImpl::SendMouseMoveEvent(const CefMouseEvent& event,
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
blink::WebMouseEvent web_event; blink::WebMouseEvent web_event;
@ -1061,7 +1061,7 @@ void CefBrowserHostImpl::SendMouseWheelEvent(const CefMouseEvent& event,
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
blink::WebMouseWheelEvent web_event; blink::WebMouseWheelEvent web_event;
@ -1080,7 +1080,7 @@ void CefBrowserHostImpl::SendCaptureLostEvent() {
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->SendCaptureLostEvent(); platform_delegate_->SendCaptureLostEvent();
@ -1094,7 +1094,7 @@ void CefBrowserHostImpl::NotifyMoveOrResizeStarted() {
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->NotifyMoveOrResizeStarted(); platform_delegate_->NotifyMoveOrResizeStarted();
@ -1120,6 +1120,8 @@ void CefBrowserHostImpl::SetWindowlessFrameRate(int frame_rate) {
} }
settings_.windowless_frame_rate = frame_rate; settings_.windowless_frame_rate = frame_rate;
if (platform_delegate_)
platform_delegate_->SetWindowlessFrameRate(frame_rate); platform_delegate_->SetWindowlessFrameRate(frame_rate);
} }
@ -1423,12 +1425,14 @@ void CefBrowserHostImpl::DestroyBrowser() {
#if defined(USE_AURA) #if defined(USE_AURA)
views::Widget* CefBrowserHostImpl::GetWindowWidget() const { views::Widget* CefBrowserHostImpl::GetWindowWidget() const {
CEF_REQUIRE_UIT(); CEF_REQUIRE_UIT();
if (!platform_delegate_)
return nullptr;
return platform_delegate_->GetWindowWidget(); return platform_delegate_->GetWindowWidget();
} }
CefRefPtr<CefBrowserView> CefBrowserHostImpl::GetBrowserView() const { CefRefPtr<CefBrowserView> CefBrowserHostImpl::GetBrowserView() const {
CEF_REQUIRE_UIT(); CEF_REQUIRE_UIT();
if (IsViewsHosted()) if (IsViewsHosted() && platform_delegate_)
return platform_delegate_->GetBrowserView(); return platform_delegate_->GetBrowserView();
return nullptr; return nullptr;
} }
@ -1667,6 +1671,7 @@ void CefBrowserHostImpl::ViewText(const std::string& text) {
return; return;
} }
if (platform_delegate_)
platform_delegate_->ViewText(text); platform_delegate_->ViewText(text);
} }
@ -1680,7 +1685,7 @@ void CefBrowserHostImpl::HandleExternalProtocol(const GURL& url) {
handler->OnProtocolExecution(this, url.spec(), allow_os_execution); handler->OnProtocolExecution(this, url.spec(), allow_os_execution);
} }
if (allow_os_execution) if (allow_os_execution && platform_delegate_)
platform_delegate_->HandleExternalProtocol(url); platform_delegate_->HandleExternalProtocol(url);
} else { } else {
CEF_POST_TASK(CEF_UIT, CEF_POST_TASK(CEF_UIT,
@ -1710,6 +1715,7 @@ void CefBrowserHostImpl::OnSetFocus(cef_focus_source_t source) {
} }
} }
if (platform_delegate_)
platform_delegate_->SendFocusEvent(true); platform_delegate_->SendFocusEvent(true);
} else { } else {
CEF_POST_TASK(CEF_UIT, CEF_POST_TASK(CEF_UIT,
@ -1782,7 +1788,7 @@ CefTextInputContext CefBrowserHostImpl::GetNSTextInputContext() {
return nullptr; return nullptr;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return nullptr; return nullptr;
return platform_delegate_->GetNSTextInputContext(); return platform_delegate_->GetNSTextInputContext();
@ -1804,7 +1810,7 @@ void CefBrowserHostImpl::HandleKeyEventBeforeTextInputClient(
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->HandleKeyEventBeforeTextInputClient(keyEvent); platform_delegate_->HandleKeyEventBeforeTextInputClient(keyEvent);
@ -1824,7 +1830,7 @@ void CefBrowserHostImpl::HandleKeyEventAfterTextInputClient(
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
return platform_delegate_->HandleKeyEventAfterTextInputClient(keyEvent); return platform_delegate_->HandleKeyEventAfterTextInputClient(keyEvent);
@ -1851,7 +1857,7 @@ void CefBrowserHostImpl::DragTargetDragEnter(CefRefPtr<CefDragData> drag_data,
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->DragTargetDragEnter(drag_data, event, allowed_ops); platform_delegate_->DragTargetDragEnter(drag_data, event, allowed_ops);
@ -1871,7 +1877,7 @@ void CefBrowserHostImpl::DragTargetDragOver(const CefMouseEvent& event,
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->DragTargetDragOver(event, allowed_ops); platform_delegate_->DragTargetDragOver(event, allowed_ops);
@ -1889,7 +1895,7 @@ void CefBrowserHostImpl::DragTargetDragLeave() {
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->DragTargetDragLeave(); platform_delegate_->DragTargetDragLeave();
@ -1907,7 +1913,7 @@ void CefBrowserHostImpl::DragTargetDrop(const CefMouseEvent& event) {
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->DragTargetDrop(event); platform_delegate_->DragTargetDrop(event);
@ -1925,6 +1931,9 @@ void CefBrowserHostImpl::DragSourceSystemDragEnded() {
return; return;
} }
if (!web_contents() || !platform_delegate_)
return;
platform_delegate_->DragSourceSystemDragEnded(); platform_delegate_->DragSourceSystemDragEnded();
} }
@ -1941,7 +1950,7 @@ void CefBrowserHostImpl::DragSourceEndedAt(
return; return;
} }
if (!web_contents()) if (!web_contents() || !platform_delegate_)
return; return;
platform_delegate_->DragSourceEndedAt(x, y, op); platform_delegate_->DragSourceEndedAt(x, y, op);
@ -2111,6 +2120,9 @@ bool CefBrowserHostImpl::PreHandleKeyboardEvent(
content::WebContents* source, content::WebContents* source,
const content::NativeWebKeyboardEvent& event, const content::NativeWebKeyboardEvent& event,
bool* is_keyboard_shortcut) { bool* is_keyboard_shortcut) {
if (!platform_delegate_)
return false;
if (client_.get()) { if (client_.get()) {
CefRefPtr<CefKeyboardHandler> handler = client_->GetKeyboardHandler(); CefRefPtr<CefKeyboardHandler> handler = client_->GetKeyboardHandler();
if (handler.get()) { if (handler.get()) {
@ -2136,6 +2148,9 @@ void CefBrowserHostImpl::HandleKeyboardEvent(
if (event.skip_in_browser) if (event.skip_in_browser)
return; return;
if (!platform_delegate_)
return;
if (client_.get()) { if (client_.get()) {
CefRefPtr<CefKeyboardHandler> handler = client_->GetKeyboardHandler(); CefRefPtr<CefKeyboardHandler> handler = client_->GetKeyboardHandler();
if (handler.get()) { if (handler.get()) {
@ -2237,7 +2252,7 @@ void CefBrowserHostImpl::DidNavigateMainFramePostCommit(
content::JavaScriptDialogManager* content::JavaScriptDialogManager*
CefBrowserHostImpl::GetJavaScriptDialogManager( CefBrowserHostImpl::GetJavaScriptDialogManager(
content::WebContents* source) { content::WebContents* source) {
if (!javascript_dialog_manager_.get()) { if (!javascript_dialog_manager_.get() && platform_delegate_) {
javascript_dialog_manager_.reset( javascript_dialog_manager_.reset(
new CefJavaScriptDialogManager(this, new CefJavaScriptDialogManager(this,
platform_delegate_->CreateJavaScriptDialogRunner())); platform_delegate_->CreateJavaScriptDialogRunner()));
@ -2256,7 +2271,7 @@ bool CefBrowserHostImpl::HandleContextMenu(
content::WebContents* web_contents, content::WebContents* web_contents,
const content::ContextMenuParams& params) { const content::ContextMenuParams& params) {
CEF_REQUIRE_UIT(); CEF_REQUIRE_UIT();
if (!menu_manager_.get()) { if (!menu_manager_.get() && platform_delegate_) {
menu_manager_.reset( menu_manager_.reset(
new CefMenuManager(this, new CefMenuManager(this,
platform_delegate_->CreateMenuRunner())); platform_delegate_->CreateMenuRunner()));
@ -2268,6 +2283,7 @@ void CefBrowserHostImpl::UpdatePreferredSize(content::WebContents* source,
const gfx::Size& pref_size) { const gfx::Size& pref_size) {
#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX)) #if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
CEF_REQUIRE_UIT(); CEF_REQUIRE_UIT();
if (platform_delegate_)
platform_delegate_->SizeTo(pref_size.width(), pref_size.height()); platform_delegate_->SizeTo(pref_size.width(), pref_size.height());
#endif #endif
} }
@ -2940,7 +2956,7 @@ void CefBrowserHostImpl::SetFocusedFrame(int64 frame_id) {
gfx::Point CefBrowserHostImpl::GetScreenPoint(const gfx::Point& view) const { gfx::Point CefBrowserHostImpl::GetScreenPoint(const gfx::Point& view) const {
CEF_REQUIRE_UIT(); CEF_REQUIRE_UIT();
if (platform_delegate_.get()) if (platform_delegate_)
return platform_delegate_->GetScreenPoint(view); return platform_delegate_->GetScreenPoint(view);
return gfx::Point(); return gfx::Point();
} }
@ -3026,7 +3042,7 @@ void CefBrowserHostImpl::OnDevToolsWebContentsDestroyed() {
void CefBrowserHostImpl::EnsureFileDialogManager() { void CefBrowserHostImpl::EnsureFileDialogManager() {
CEF_REQUIRE_UIT(); CEF_REQUIRE_UIT();
if (!file_dialog_manager_.get()) { if (!file_dialog_manager_.get() && platform_delegate_) {
file_dialog_manager_.reset( file_dialog_manager_.reset(
new CefFileDialogManager(this, new CefFileDialogManager(this,
platform_delegate_->CreateFileDialogRunner())); platform_delegate_->CreateFileDialogRunner()));