diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:05:51 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-23 15:31:48 +0000 |
| commit | 9cb87fa7638e305ef35b04f54ba07ac4fa04adcb (patch) | |
| tree | 2793d80883b7daab67258117755046d428f9978c /chromium/content/browser/devtools/protocol/page_handler.cc | |
| parent | 98ff39cb35ef2bd32bb1af9565628a4a4b0979b2 (diff) | |
| download | qtwebengine-chromium-9cb87fa7638e305ef35b04f54ba07ac4fa04adcb.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.71
Also adds a few missing spellcheck sources.
Change-Id: I300864710316ff3cd3ad456dd7a3d048b45f57d5
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/content/browser/devtools/protocol/page_handler.cc')
| -rw-r--r-- | chromium/content/browser/devtools/protocol/page_handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/content/browser/devtools/protocol/page_handler.cc b/chromium/content/browser/devtools/protocol/page_handler.cc index c1e88169d5d..73c4c8ea965 100644 --- a/chromium/content/browser/devtools/protocol/page_handler.cc +++ b/chromium/content/browser/devtools/protocol/page_handler.cc @@ -214,7 +214,8 @@ Response PageHandler::Reload(const bool* ignoreCache, return Response::InternalError("Could not connect to view"); if (web_contents->IsCrashed() || - web_contents->GetController().GetVisibleEntry()->IsViewSourceMode()) { + (web_contents->GetController().GetVisibleEntry() && + web_contents->GetController().GetVisibleEntry()->IsViewSourceMode())) { web_contents->GetController().Reload(false); return Response::OK(); } else { |