diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-08-25 19:20:41 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:30:55 +0000 |
| commit | 6882a04fb36642862b11efe514251d32070c3d65 (patch) | |
| tree | b7959826000b061fd5ccc7512035c7478742f7b0 /Source/WebKit2/UIProcess/WebContextClient.cpp | |
| parent | ab6df191029eeeb0b0f16f127d553265659f739e (diff) | |
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/UIProcess/WebContextClient.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebContextClient.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/WebContextClient.cpp b/Source/WebKit2/UIProcess/WebContextClient.cpp index df13e8778..46b36d196 100644 --- a/Source/WebKit2/UIProcess/WebContextClient.cpp +++ b/Source/WebKit2/UIProcess/WebContextClient.cpp @@ -26,27 +26,28 @@ #include "config.h" #include "WebContextClient.h" -#include "WebContext.h" +#include "APIArray.h" +#include "WebProcessPool.h" namespace WebKit { -void WebContextClient::plugInAutoStartOriginHashesChanged(WebContext* context) +void WebContextClient::plugInAutoStartOriginHashesChanged(WebProcessPool* processPool) { if (!m_client.plugInAutoStartOriginHashesChanged) return; - m_client.plugInAutoStartOriginHashesChanged(toAPI(context), m_client.clientInfo); + m_client.plugInAutoStartOriginHashesChanged(toAPI(processPool), m_client.base.clientInfo); } -void WebContextClient::networkProcessDidCrash(WebContext* context) +void WebContextClient::networkProcessDidCrash(WebProcessPool* processPool) { if (!m_client.networkProcessDidCrash) return; - m_client.networkProcessDidCrash(toAPI(context), m_client.clientInfo); + m_client.networkProcessDidCrash(toAPI(processPool), m_client.base.clientInfo); } -void WebContextClient::plugInInformationBecameAvailable(WebContext* context, ImmutableArray* plugInInfo) +void WebContextClient::plugInInformationBecameAvailable(WebProcessPool* processPool, API::Array* plugInInfo) { if (!m_client.plugInInformationBecameAvailable) return; @@ -54,7 +55,15 @@ void WebContextClient::plugInInformationBecameAvailable(WebContext* context, Imm // FIXME: The API contract expects us to hand a reference to the array here. This is wrong. plugInInfo->ref(); - m_client.plugInInformationBecameAvailable(toAPI(context), toAPI(plugInInfo), m_client.clientInfo); + m_client.plugInInformationBecameAvailable(toAPI(processPool), toAPI(plugInInfo), m_client.base.clientInfo); +} + +PassRefPtr<API::Data> WebContextClient::copyWebCryptoMasterKey(WebProcessPool* processPool) +{ + if (!m_client.copyWebCryptoMasterKey) + return nullptr; + + return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(processPool), m_client.base.clientInfo))); } } // namespace WebKit |