<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170114] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170114">170114</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-18 13:56:12 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify WebCredential
https://bugs.webkit.org/show_bug.cgi?id=134036
Reviewed by Andreas Kling.
* UIProcess/API/C/WKCredential.cpp:
(WKCredentialCreate):
(WKCredentialCreateWithCertificateInfo):
(WKCredentialCopyUser):
* UIProcess/Authentication/AuthenticationChallengeProxy.cpp:
(WebKit::AuthenticationChallengeProxy::useCredential):
* UIProcess/Authentication/WebCredential.cpp:
(WebKit::WebCredential::credential):
(WebKit::WebCredential::core): Deleted.
(WebKit::WebCredential::user): Deleted.
* UIProcess/Authentication/WebCredential.h:
(WebKit::WebCredential::create): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKCredentialcpp">trunk/Source/WebKit2/UIProcess/API/C/WKCredential.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAuthenticationAuthenticationChallengeProxycpp">trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAuthenticationWebCredentialcpp">trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAuthenticationWebCredentialh">trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170113 => 170114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-18 19:40:25 UTC (rev 170113)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-18 20:56:12 UTC (rev 170114)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-06-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Simplify WebCredential
+ https://bugs.webkit.org/show_bug.cgi?id=134036
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/C/WKCredential.cpp:
+ (WKCredentialCreate):
+ (WKCredentialCreateWithCertificateInfo):
+ (WKCredentialCopyUser):
+ * UIProcess/Authentication/AuthenticationChallengeProxy.cpp:
+ (WebKit::AuthenticationChallengeProxy::useCredential):
+ * UIProcess/Authentication/WebCredential.cpp:
+ (WebKit::WebCredential::credential):
+ (WebKit::WebCredential::core): Deleted.
+ (WebKit::WebCredential::user): Deleted.
+ * UIProcess/Authentication/WebCredential.h:
+ (WebKit::WebCredential::create): Deleted.
+
+2014-06-18 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Adopt modern C++11 loops and fix WebArchive creation functions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134032
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKCredentialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCredential.cpp (170113 => 170114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCredential.cpp 2014-06-18 19:40:25 UTC (rev 170113)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCredential.cpp 2014-06-18 20:56:12 UTC (rev 170114)
</span><span class="lines">@@ -40,18 +40,16 @@
</span><span class="cx">
</span><span class="cx"> WKCredentialRef WKCredentialCreate(WKStringRef username, WKStringRef password, WKCredentialPersistence persistence)
</span><span class="cx"> {
</span><del>- RefPtr<WebCredential> credential = WebCredential::create(toImpl(username), toImpl(password), toCredentialPersistence(persistence));
- return toAPI(credential.release().leakRef());
</del><ins>+ return toAPI(WebCredential::create(WebCore::Credential(toImpl(username)->string(), toImpl(password)->string(), toCredentialPersistence(persistence))).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKCredentialRef WKCredentialCreateWithCertificateInfo(WKCertificateInfoRef certificateInfo)
</span><span class="cx"> {
</span><del>- RefPtr<WebCredential> credential = WebCredential::create(toImpl(certificateInfo));
- return toAPI(credential.release().leakRef());
</del><ins>+ return toAPI(WebCredential::create(toImpl(certificateInfo)).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKCredentialCopyUser(WKCredentialRef credentialRef)
</span><span class="cx"> {
</span><del>- return toCopiedAPI(toImpl(credentialRef)->user());
</del><ins>+ return toCopiedAPI(toImpl(credentialRef)->credential().user());
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAuthenticationAuthenticationChallengeProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp (170113 => 170114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp 2014-06-18 19:40:25 UTC (rev 170113)
+++ trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.cpp 2014-06-18 20:56:12 UTC (rev 170114)
</span><span class="lines">@@ -62,15 +62,19 @@
</span><span class="cx"> if (!m_challengeID)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!credential)
- m_connection->send(Messages::AuthenticationManager::ContinueWithoutCredentialForChallenge(m_challengeID), 0);
- else {
- WebCertificateInfo* certificateInfo = credential->certificateInfo();
- WebCore::CertificateInfo platformInfo = certificateInfo ? certificateInfo->certificateInfo() : WebCore::CertificateInfo();
- m_connection->send(Messages::AuthenticationManager::UseCredentialForChallenge(m_challengeID, credential->core(), platformInfo), 0);
</del><ins>+ uint64_t challengeID = m_challengeID;
+ m_challengeID = 0;
+
+ if (!credential) {
+ m_connection->send(Messages::AuthenticationManager::ContinueWithoutCredentialForChallenge(challengeID), 0);
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_challengeID = 0;
</del><ins>+ WebCore::CertificateInfo certificateInfo;
+ if (credential->certificateInfo())
+ certificateInfo = credential->certificateInfo()->certificateInfo();
+
+ m_connection->send(Messages::AuthenticationManager::UseCredentialForChallenge(challengeID, credential->credential(), certificateInfo), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AuthenticationChallengeProxy::cancel()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAuthenticationWebCredentialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.cpp (170113 => 170114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.cpp 2014-06-18 19:40:25 UTC (rev 170113)
+++ trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.cpp 2014-06-18 20:56:12 UTC (rev 170114)
</span><span class="lines">@@ -49,14 +49,9 @@
</span><span class="cx"> return m_certificateInfo.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const WebCore::Credential& WebCredential::core()
</del><ins>+const WebCore::Credential& WebCredential::credential()
</ins><span class="cx"> {
</span><span class="cx"> return m_coreCredential;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const String& WebCredential::user() const
-{
- return m_coreCredential.user();
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAuthenticationWebCredentialh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.h (170113 => 170114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.h 2014-06-18 19:40:25 UTC (rev 170113)
+++ trunk/Source/WebKit2/UIProcess/Authentication/WebCredential.h 2014-06-18 20:56:12 UTC (rev 170114)
</span><span class="lines">@@ -44,11 +44,6 @@
</span><span class="cx"> return adoptRef(new WebCredential(credential));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<WebCredential> create(API::String* username, API::String* password, WebCore::CredentialPersistence persistence)
- {
- return adoptRef(new WebCredential(WebCore::Credential(username->string(), password->string(), persistence)));
- }
-
</del><span class="cx"> static PassRefPtr<WebCredential> create(WebCertificateInfo* certificateInfo)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebCredential(certificateInfo));
</span><span class="lines">@@ -56,10 +51,8 @@
</span><span class="cx">
</span><span class="cx"> WebCertificateInfo* certificateInfo();
</span><span class="cx">
</span><del>- const WebCore::Credential& core();
</del><ins>+ const WebCore::Credential& credential();
</ins><span class="cx">
</span><del>- const String& user() const;
-
</del><span class="cx"> private:
</span><span class="cx"> explicit WebCredential(const WebCore::Credential&);
</span><span class="cx"> explicit WebCredential(WebCertificateInfo*);
</span></span></pre>
</div>
</div>
</body>
</html>