diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-19 12:37:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-25 14:41:06 +0000 |
| commit | f4a8ce98bd371acf1ca1eb2c58a8403e8795a670 (patch) | |
| tree | 1f2305261b605aae31e5f8737ffcb275986baf1e /src/core/web_contents_delegate_qt.cpp | |
| parent | 448478729cfdf5098dd24a6a870bacdbcd8cf9a7 (diff) | |
Adaptations for Chromium 63
Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 51ea7eda3..5364afa94 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -219,16 +219,6 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga if (!navigation_handle->IsInMainFrame()) return; - // Suppress extra loadStarted signal for data URL with specified base URL. - if (navigation_handle->GetURL().SchemeIs(url::kDataScheme)) { - content::NavigationEntry *pending_entry = navigation_handle->GetWebContents()->GetController().GetPendingEntry(); - - if (pending_entry && !pending_entry->GetBaseURLForDataURL().is_empty() && - navigation_handle->GetURL() == pending_entry->GetURL()) { - return; - } - } - // Error-pages are not reported as separate started navigations. Q_ASSERT(!navigation_handle->IsErrorPage()); @@ -459,7 +449,7 @@ void WebContentsDelegateQt::UpdateTargetURL(content::WebContents* source, const void WebContentsDelegateQt::WasShown() { - web_cache::WebCacheManager::GetInstance()->ObserveActivity(web_contents()->GetRenderProcessHost()->GetID()); + web_cache::WebCacheManager::GetInstance()->ObserveActivity(web_contents()->GetMainFrame()->GetProcess()->GetID()); } void WebContentsDelegateQt::DidFirstVisuallyNonEmptyPaint() |