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/chromium_gpu_helper.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/chromium_gpu_helper.cpp')
| -rw-r--r-- | src/core/chromium_gpu_helper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/chromium_gpu_helper.cpp b/src/core/chromium_gpu_helper.cpp index 663b1ec17..9a6bb0033 100644 --- a/src/core/chromium_gpu_helper.cpp +++ b/src/core/chromium_gpu_helper.cpp @@ -109,9 +109,9 @@ gpu::gles2::MailboxManager *mailbox_manager() return gpuChannelManager->mailbox_manager(); } -gpu::gles2::Texture* ConsumeTexture(gpu::gles2::MailboxManager *mailboxManager, unsigned target, const gpu::gles2::MailboxName& name) +gpu::gles2::Texture* ConsumeTexture(gpu::gles2::MailboxManager *mailboxManager, unsigned target, const gpu::Mailbox& mailbox) { - return mailboxManager->ConsumeTexture(target, name); + return mailboxManager->ConsumeTexture(target, mailbox); } unsigned int service_id(gpu::gles2::Texture *tex) |