diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-07-28 17:29:14 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-14 16:43:32 +0200 |
commit | b1d423a3fc2cb3eeacc2a3e91ac9bdd2211c2613 (patch) | |
tree | 53f39e4e7c6a76d19a92fc23fde0728e6df95fc7 /src/core/network_delegate_qt.cpp | |
parent | f987b713b9f4e363056bf5174a762acb5b77ed79 (diff) |
Update the QtWebEngineCore library to run on top of Chromium 37
Most of the patch is about upstream classes/methods that changed.
Other important details:
- icu data files are now used by default
- cygwin is no longer required to build on Windows
- RenderFrameHost has been replacing RenderViewHost in a few places,
following the separate process iframes support in Chromium
- The user agent is accessed through ContentClient::GetUserAgent
instead of from the command line switches
Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/network_delegate_qt.cpp')
-rw-r--r-- | src/core/network_delegate_qt.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp index 424d0e631..56156a4fb 100644 --- a/src/core/network_delegate_qt.cpp +++ b/src/core/network_delegate_qt.cpp @@ -84,8 +84,8 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); const content::ResourceRequestInfo *info = content::ResourceRequestInfo::ForRequest(request); int renderProcessId; - int renderViewId; - if (!info || !info->GetRenderViewForRequest(request, &renderProcessId, &renderViewId)) + int renderFrameId; + if (!info || !info->GetRenderFrameForRequest(request, &renderProcessId, &renderFrameId)) // Abort the request if it has no associated render info / render view. return net::ERR_ABORTED; @@ -105,7 +105,7 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C resourceType == ResourceType::MAIN_FRAME, navigationType, renderProcessId, - renderViewId + renderFrameId }; content::BrowserThread::PostTask( @@ -159,11 +159,11 @@ void NetworkDelegateQt::NotifyNavigationRequestedOnUIThread(net::URLRequest *req Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); int navigationRequestAction = WebContentsAdapterClient::AcceptRequest; - content::RenderViewHost *rvh = content::RenderViewHost::FromID(params.renderProcessId, params.renderViewId); + content::RenderFrameHost *rfh = content::RenderFrameHost::FromID(params.renderProcessId, params.renderFrameId); - if (rvh) { - content::WebContents *webContents = content::WebContents::FromRenderViewHost(rvh); - WebContentsAdapterClient *client = WebContentsViewQt::from(webContents->GetView())->client(); + if (rfh) { + content::WebContents *webContents = content::WebContents::FromRenderViewHost(rfh->GetRenderViewHost()); + WebContentsAdapterClient *client = WebContentsViewQt::from(static_cast<content::WebContentsImpl*>(webContents)->GetView())->client(); client->navigationRequested(params.navigationType, params.url, navigationRequestAction, params.isMainFrameRequest); } |