diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/Authentication')
-rw-r--r-- | Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp | 14 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp index ffe8bac..ecff862 100644 --- a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp +++ b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp @@ -36,10 +36,10 @@ namespace WebKit { -AuthenticationChallengeProxy::AuthenticationChallengeProxy(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, WebPageProxy* page) +AuthenticationChallengeProxy::AuthenticationChallengeProxy(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, WebProcessProxy* process) : m_coreAuthenticationChallenge(authenticationChallenge) , m_challengeID(challengeID) - , m_page(page) + , m_process(process) { ASSERT(m_challengeID); m_listener = AuthenticationDecisionListener::create(this); @@ -49,8 +49,8 @@ AuthenticationChallengeProxy::~AuthenticationChallengeProxy() { // If an outstanding AuthenticationChallengeProxy is being destroyed even though it hasn't been responded to yet, // we cancel it here so the WebProcess isn't waiting for an answer forever. - if (m_challengeID && m_page->process()) - m_page->process()->send(Messages::AuthenticationManager::CancelChallenge(m_challengeID), m_page->pageID()); + if (m_challengeID) + m_process->send(Messages::AuthenticationManager::CancelChallenge(m_challengeID), 0); if (m_listener) m_listener->detachChallenge(); @@ -62,9 +62,9 @@ void AuthenticationChallengeProxy::useCredential(WebCredential* credential) return; if (!credential) - m_page->process()->send(Messages::AuthenticationManager::ContinueWithoutCredentialForChallenge(m_challengeID), m_page->pageID()); + m_process->send(Messages::AuthenticationManager::ContinueWithoutCredentialForChallenge(m_challengeID), 0); else - m_page->process()->send(Messages::AuthenticationManager::UseCredentialForChallenge(m_challengeID, credential->core()), m_page->pageID()); + m_process->send(Messages::AuthenticationManager::UseCredentialForChallenge(m_challengeID, credential->core()), 0); m_challengeID = 0; } @@ -74,7 +74,7 @@ void AuthenticationChallengeProxy::cancel() if (!m_challengeID) return; - m_page->process()->send(Messages::AuthenticationManager::CancelChallenge(m_challengeID), m_page->pageID()); + m_process->send(Messages::AuthenticationManager::CancelChallenge(m_challengeID), 0); m_challengeID = 0; } diff --git a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h index d4e76dd..a429ac5 100644 --- a/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h +++ b/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h @@ -40,16 +40,16 @@ namespace WebKit { class AuthenticationDecisionListener; class WebCredential; -class WebPageProxy; +class WebProcessProxy; class WebProtectionSpace; class AuthenticationChallengeProxy : public APIObject { public: static const Type APIType = TypeAuthenticationChallenge; - static PassRefPtr<AuthenticationChallengeProxy> create(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, WebPageProxy* page) + static PassRefPtr<AuthenticationChallengeProxy> create(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, WebProcessProxy* process) { - return adoptRef(new AuthenticationChallengeProxy(authenticationChallenge, challengeID, page)); + return adoptRef(new AuthenticationChallengeProxy(authenticationChallenge, challengeID, process)); } ~AuthenticationChallengeProxy(); @@ -63,13 +63,13 @@ public: int previousFailureCount() const { return m_coreAuthenticationChallenge.previousFailureCount(); } private: - AuthenticationChallengeProxy(const WebCore::AuthenticationChallenge&, uint64_t challengeID, WebPageProxy* page); + AuthenticationChallengeProxy(const WebCore::AuthenticationChallenge&, uint64_t challengeID, WebProcessProxy*); virtual Type type() const { return APIType; } WebCore::AuthenticationChallenge m_coreAuthenticationChallenge; uint64_t m_challengeID; - RefPtr<WebPageProxy> m_page; + RefPtr<WebProcessProxy> m_process; RefPtr<AuthenticationDecisionListener> m_listener; mutable RefPtr<WebCredential> m_webCredential; mutable RefPtr<WebProtectionSpace> m_webProtectionSpace; |