<!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>[171722] trunk/Source/WebCore</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/171722">171722</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-07-28 21:22:14 -0700 (Mon, 28 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduced CredentialBase and made Credential derive from it
Work towards fixing https://bugs.webkit.org/show_bug.cgi?id=135327
Reviewed by Darin Adler.
No change in functionality.
* CMakeLists.txt: Updated for source file rename.
* WebCore.exp.in: Changed to export CredentialBase symbols.
* WebCore.vcxproj/WebCore.vcxproj: Updated for source file rename and new header.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* platform/network/Credential.cpp: Renamed to CredentialBase.cpp.
* platform/network/Credential.h: Defined Credential to derive from CredentialBase.
* platform/network/CredentialBase.cpp: Renamed Credential.cpp to this. Updated for the new
name.
* platform/network/CredentialBase.h: Copied from Credential.h, renamed the class to
CredentialBase, and made the constructors protected.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCredentialh">trunk/Source/WebCore/platform/network/Credential.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkCredentialBasecpp">trunk/Source/WebCore/platform/network/CredentialBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCredentialBaseh">trunk/Source/WebCore/platform/network/CredentialBase.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkCredentialcpp">trunk/Source/WebCore/platform/network/Credential.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (171721 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-07-29 04:17:46 UTC (rev 171721)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -2208,7 +2208,7 @@
</span><span class="cx"> platform/network/BlobRegistry.cpp
</span><span class="cx"> platform/network/BlobRegistryImpl.cpp
</span><span class="cx"> platform/network/BlobResourceHandle.cpp
</span><del>- platform/network/Credential.cpp
</del><ins>+ platform/network/CredentialBase.cpp
</ins><span class="cx"> platform/network/CredentialStorage.cpp
</span><span class="cx"> platform/network/DNSResolveQueue.cpp
</span><span class="cx"> platform/network/DataURL.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171721 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-29 04:17:46 UTC (rev 171721)
+++ trunk/Source/WebCore/ChangeLog 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-07-28 Dan Bernstein <mitz@apple.com>
+
+ Introduced CredentialBase and made Credential derive from it
+ Work towards fixing https://bugs.webkit.org/show_bug.cgi?id=135327
+
+ Reviewed by Darin Adler.
+
+ No change in functionality.
+
+ * CMakeLists.txt: Updated for source file rename.
+
+ * WebCore.exp.in: Changed to export CredentialBase symbols.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Updated for source file rename and new header.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+
+ * platform/network/Credential.cpp: Renamed to CredentialBase.cpp.
+
+ * platform/network/Credential.h: Defined Credential to derive from CredentialBase.
+
+ * platform/network/CredentialBase.cpp: Renamed Credential.cpp to this. Updated for the new
+ name.
+
+ * platform/network/CredentialBase.h: Copied from Credential.h, renamed the class to
+ CredentialBase, and made the constructors protected.
+
</ins><span class="cx"> 2014-07-28 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r164133): Selection disappears after scrolling on nytimes.com
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (171721 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-07-29 04:17:46 UTC (rev 171721)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -71,8 +71,6 @@
</span><span class="cx"> __ZN7WebCore10ClientRectC1ERKNS_7IntRectE
</span><span class="cx"> __ZN7WebCore10ClientRectC1ERKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore10ClientRectC1Ev
</span><del>-__ZN7WebCore10CredentialC1ERKN3WTF6StringES4_NS_21CredentialPersistenceE
-__ZN7WebCore10CredentialC1Ev
</del><span class="cx"> __ZN7WebCore10FloatPointC1ERK7CGPoint
</span><span class="cx"> __ZN7WebCore10FloatPointC1ERKNS_8IntPointE
</span><span class="cx"> __ZN7WebCore10FontGlyphs15releaseFontDataEv
</span><span class="lines">@@ -336,6 +334,9 @@
</span><span class="cx"> __ZN7WebCore14ClientRectListC1ERKN3WTF6VectorINS_9FloatQuadELm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore14ClientRectListC1Ev
</span><span class="cx"> __ZN7WebCore14ClientRectListD1Ev
</span><ins>+__ZN7WebCore14CredentialBaseC2EP20OpaqueSecIdentityRefPK9__CFArrayNS_21CredentialPersistenceE
+__ZN7WebCore14CredentialBaseC2ERKN3WTF6StringES4_NS_21CredentialPersistenceE
+__ZN7WebCore14CredentialBaseC2Ev
</ins><span class="cx"> __ZN7WebCore14DocumentLoader10commitDataEPKcm
</span><span class="cx"> __ZN7WebCore14DocumentLoader12dataReceivedEPNS_14CachedResourceEPKci
</span><span class="cx"> __ZN7WebCore14DocumentLoader13attachToFrameEv
</span><span class="lines">@@ -1534,14 +1535,6 @@
</span><span class="cx"> __ZN7WebCore9unionRectERKN3WTF6VectorINS_9FloatRectELm0ENS0_15CrashOnOverflowEEE
</span><span class="cx"> __ZNK3JSC8Bindings10RootObject12globalObjectEv
</span><span class="cx"> __ZNK3WTF6String14createCFStringEv
</span><del>-__ZNK7WebCore10Credential11hasPasswordEv
-__ZNK7WebCore10Credential11persistenceEv
-__ZNK7WebCore10Credential12certificatesEv
-__ZNK7WebCore10Credential4typeEv
-__ZNK7WebCore10Credential4userEv
-__ZNK7WebCore10Credential7isEmptyEv
-__ZNK7WebCore10Credential8identityEv
-__ZNK7WebCore10Credential8passwordEv
</del><span class="cx"> __ZNK7WebCore10FloatPointcv7CGPointEv
</span><span class="cx"> __ZNK7WebCore10FontGlyphs17realizeFontDataAtERKNS_15FontDescriptionEj
</span><span class="cx"> __ZNK7WebCore10LayoutRect8containsERKS0_
</span><span class="lines">@@ -1659,6 +1652,14 @@
</span><span class="cx"> __ZNK7WebCore13ResourceError7cfErrorEv
</span><span class="cx"> __ZNK7WebCore13ResourceError7nsErrorEv
</span><span class="cx"> __ZNK7WebCore13ResourceErrorcvP7NSErrorEv
</span><ins>+__ZNK7WebCore14CredentialBase11hasPasswordEv
+__ZNK7WebCore14CredentialBase11persistenceEv
+__ZNK7WebCore14CredentialBase12certificatesEv
+__ZNK7WebCore14CredentialBase4typeEv
+__ZNK7WebCore14CredentialBase4userEv
+__ZNK7WebCore14CredentialBase7isEmptyEv
+__ZNK7WebCore14CredentialBase8identityEv
+__ZNK7WebCore14CredentialBase8passwordEv
</ins><span class="cx"> __ZNK7WebCore14DocumentLoader10requestURLEv
</span><span class="cx"> __ZNK7WebCore14DocumentLoader11frameLoaderEv
</span><span class="cx"> __ZNK7WebCore14DocumentLoader11responseURLEv
</span><span class="lines">@@ -2219,7 +2220,6 @@
</span><span class="cx"> .objc_class_name_WebFontCache
</span><span class="cx"> .objc_class_name_WebWindowFadeAnimation
</span><span class="cx"> .objc_class_name_WebWindowScaleAnimation
</span><del>-__ZN7WebCore10CredentialC1EP20OpaqueSecIdentityRefPK9__CFArrayNS_21CredentialPersistenceE
</del><span class="cx"> __ZN7WebCore10FloatPointC1ERK8_NSPoint
</span><span class="cx"> __ZN7WebCore10handCursorEv
</span><span class="cx"> __ZN7WebCore11CachedImage5imageEv
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (171721 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-07-29 04:17:46 UTC (rev 171721)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -8532,7 +8532,7 @@
</span><span class="cx"> <ClCompile Include="..\platform\network\BlobResourceHandle.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\network\BlobRegistry.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\network\BlobRegistryImpl.cpp" />
</span><del>- <ClCompile Include="..\platform\network\Credential.cpp" />
</del><ins>+ <ClCompile Include="..\platform\network\CredentialBase.cpp" />
</ins><span class="cx"> <ClCompile Include="..\platform\network\CredentialStorage.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\network\DataURL.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\network\DNSResolveQueue.cpp" />
</span><span class="lines">@@ -19764,6 +19764,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\network\BlobResourceHandle.h" />
</span><span class="cx"> <ClInclude Include="..\platform\network\CookieStorage.h" />
</span><span class="cx"> <ClInclude Include="..\platform\network\Credential.h" />
</span><ins>+ <ClInclude Include="..\platform\network\CredentialBase.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\network\CredentialStorage.h" />
</span><span class="cx"> <ClInclude Include="..\platform\network\DataURL.h" />
</span><span class="cx"> <ClInclude Include="..\platform\network\DNSResolveQueue.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (171721 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-07-29 04:17:46 UTC (rev 171721)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -1791,7 +1791,7 @@
</span><span class="cx"> <ClCompile Include="..\platform\network\BlobResourceHandle.cpp">
</span><span class="cx"> <Filter>platform\network</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\platform\network\Credential.cpp">
</del><ins>+ <ClCompile Include="..\platform\network\CredentialBase.cpp">
</ins><span class="cx"> <Filter>platform\network</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\platform\network\CredentialStorage.cpp">
</span><span class="lines">@@ -8808,6 +8808,9 @@
</span><span class="cx"> <ClInclude Include="..\platform\network\Credential.h">
</span><span class="cx"> <Filter>platform\network</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\platform\network\CredentialBase.h">
+ <Filter>platform\network</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\platform\network\CredentialStorage.h">
</span><span class="cx"> <Filter>platform\network</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (171721 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-29 04:17:46 UTC (rev 171721)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -1313,6 +1313,7 @@
</span><span class="cx"> 3784C34B0E11AA34007D8D48 /* FontTraitsMask.h in Headers */ = {isa = PBXBuildFile; fileRef = 3784C34A0E11AA34007D8D48 /* FontTraitsMask.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 37919C230B7D188600A56998 /* PositionIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37919C210B7D188600A56998 /* PositionIterator.cpp */; };
</span><span class="cx"> 37919C240B7D188600A56998 /* PositionIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 37919C220B7D188600A56998 /* PositionIterator.h */; settings = {ATTRIBUTES = (); }; };
</span><ins>+ 3792917A1985EF3900F4B661 /* CredentialBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 379291781985EF3900F4B661 /* CredentialBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 379919961200DDF400EA041C /* WOFFFileFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 379919941200DDF400EA041C /* WOFFFileFormat.cpp */; };
</span><span class="cx"> 379919971200DDF400EA041C /* WOFFFileFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 379919951200DDF400EA041C /* WOFFFileFormat.h */; };
</span><span class="cx"> 379919B21200DE5000EA041C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 379919B11200DE5000EA041C /* libz.dylib */; };
</span><span class="lines">@@ -1858,7 +1859,7 @@
</span><span class="cx"> 514C76510CE9234E007EF3CD /* ResourceHandleMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */; };
</span><span class="cx"> 514C76530CE9234E007EF3CD /* ResourceRequestMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */; };
</span><span class="cx"> 514C76550CE9234F007EF3CD /* ResourceResponseMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C764B0CE9234E007EF3CD /* ResourceResponseMac.mm */; };
</span><del>- 514C766D0CE923A1007EF3CD /* Credential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76580CE923A1007EF3CD /* Credential.cpp */; };
</del><ins>+ 514C766D0CE923A1007EF3CD /* CredentialBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76580CE923A1007EF3CD /* CredentialBase.cpp */; };
</ins><span class="cx"> 514C766E0CE923A1007EF3CD /* Credential.h in Headers */ = {isa = PBXBuildFile; fileRef = 514C76590CE923A1007EF3CD /* Credential.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 514C766F0CE923A1007EF3CD /* FormData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C765A0CE923A1007EF3CD /* FormData.cpp */; };
</span><span class="cx"> 514C76700CE923A1007EF3CD /* FormData.h in Headers */ = {isa = PBXBuildFile; fileRef = 514C765B0CE923A1007EF3CD /* FormData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8337,6 +8338,7 @@
</span><span class="cx"> 3784C34A0E11AA34007D8D48 /* FontTraitsMask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontTraitsMask.h; sourceTree = "<group>"; };
</span><span class="cx"> 37919C210B7D188600A56998 /* PositionIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PositionIterator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 37919C220B7D188600A56998 /* PositionIterator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PositionIterator.h; sourceTree = "<group>"; };
</span><ins>+ 379291781985EF3900F4B661 /* CredentialBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CredentialBase.h; sourceTree = "<group>"; };
</ins><span class="cx"> 379919941200DDF400EA041C /* WOFFFileFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WOFFFileFormat.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 379919951200DDF400EA041C /* WOFFFileFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WOFFFileFormat.h; sourceTree = "<group>"; };
</span><span class="cx"> 379919B11200DE5000EA041C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
</span><span class="lines">@@ -8945,7 +8947,7 @@
</span><span class="cx"> 514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 514C764B0CE9234E007EF3CD /* ResourceResponseMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceResponseMac.mm; sourceTree = "<group>"; };
</span><del>- 514C76580CE923A1007EF3CD /* Credential.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Credential.cpp; sourceTree = "<group>"; };
</del><ins>+ 514C76580CE923A1007EF3CD /* CredentialBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialBase.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 514C76590CE923A1007EF3CD /* Credential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Credential.h; sourceTree = "<group>"; };
</span><span class="cx"> 514C765A0CE923A1007EF3CD /* FormData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 514C765B0CE923A1007EF3CD /* FormData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormData.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16329,8 +16331,9 @@
</span><span class="cx"> 2EB4BCD0121F03E300EC4885 /* BlobResourceHandle.cpp */,
</span><span class="cx"> 2EB4BCD1121F03E300EC4885 /* BlobResourceHandle.h */,
</span><span class="cx"> E13F01EA1270E10D00DFBA71 /* CookieStorage.h */,
</span><del>- 514C76580CE923A1007EF3CD /* Credential.cpp */,
</del><span class="cx"> 514C76590CE923A1007EF3CD /* Credential.h */,
</span><ins>+ 514C76580CE923A1007EF3CD /* CredentialBase.cpp */,
+ 379291781985EF3900F4B661 /* CredentialBase.h */,
</ins><span class="cx"> 51A052321058774F00CC9E95 /* CredentialStorage.cpp */,
</span><span class="cx"> 51A052311058774F00CC9E95 /* CredentialStorage.h */,
</span><span class="cx"> B2F34FE50E82F81400F627CD /* DNS.h */,
</span><span class="lines">@@ -24159,6 +24162,7 @@
</span><span class="cx"> A7B6E69F0B291A9600D0529F /* DragData.h in Headers */,
</span><span class="cx"> A7CFB3D20B7ED10A0070C32D /* DragImage.h in Headers */,
</span><span class="cx"> 81F65FF613788FAA00FF6F2D /* DragState.h in Headers */,
</span><ins>+ 3792917A1985EF3900F4B661 /* CredentialBase.h in Headers */,
</ins><span class="cx"> 498770DC1242C535002226BA /* DrawingBuffer.h in Headers */,
</span><span class="cx"> E1BA66F11742BD8600C20251 /* DynamicLinkerInterposing.h in Headers */,
</span><span class="cx"> FD6ED2C8136B8E66003CF072 /* DynamicsCompressor.h in Headers */,
</span><span class="lines">@@ -27282,7 +27286,7 @@
</span><span class="cx"> BC5EB9500E82056B00B25965 /* CounterDirectives.cpp in Sources */,
</span><span class="cx"> 9392F1500AD1862300691BD4 /* CounterNode.cpp in Sources */,
</span><span class="cx"> D0B0556909C6700100307E43 /* CreateLinkCommand.cpp in Sources */,
</span><del>- 514C766D0CE923A1007EF3CD /* Credential.cpp in Sources */,
</del><ins>+ 514C766D0CE923A1007EF3CD /* CredentialBase.cpp in Sources */,
</ins><span class="cx"> 51A052341058774F00CC9E95 /* CredentialStorage.cpp in Sources */,
</span><span class="cx"> 7EE6846512D26E3800E79415 /* CredentialStorageCFNet.cpp in Sources */,
</span><span class="cx"> E1B4CD2510B322E200BFFD7E /* CredentialStorageMac.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCredentialcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/Credential.cpp (171721 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/Credential.cpp 2014-07-29 04:17:46 UTC (rev 171721)
+++ trunk/Source/WebCore/platform/network/Credential.cpp 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -1,162 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "config.h"
-#include "Credential.h"
-
-namespace WebCore {
-
-// Need to enforce empty, non-null strings due to the pickiness of the String == String operator
-// combined with the semantics of the String(NSString*) constructor
-Credential::Credential()
- : m_user("")
- , m_password("")
- , m_persistence(CredentialPersistenceNone)
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- , m_type(CredentialTypePassword)
-#endif
-{
-}
-
-// Need to enforce empty, non-null strings due to the pickiness of the String == String operator
-// combined with the semantics of the String(NSString*) constructor
-Credential::Credential(const String& user, const String& password, CredentialPersistence persistence)
- : m_user(user.length() ? user : "")
- , m_password(password.length() ? password : "")
- , m_persistence(persistence)
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- , m_type(CredentialTypePassword)
-#endif
-{
-}
-
-Credential::Credential(const Credential& original, CredentialPersistence persistence)
- : m_user(original.user())
- , m_password(original.password())
- , m_persistence(persistence)
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- , m_identity(original.identity())
- , m_certificates(original.certificates())
- , m_type(original.type())
-#endif
-{
-}
-
-bool Credential::isEmpty() const
-{
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- if (m_type == CredentialTypeClientCertificate && (m_identity || m_certificates))
- return false;
-#endif
-
- return m_user.isEmpty() && m_password.isEmpty();
-}
-
-const String& Credential::user() const
-{
- return m_user;
-}
-
-const String& Credential::password() const
-{
- return m_password;
-}
-
-bool Credential::hasPassword() const
-{
- return !m_password.isEmpty();
-}
-
-CredentialPersistence Credential::persistence() const
-{
- return m_persistence;
-}
-
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
-Credential::Credential(SecIdentityRef identity, CFArrayRef certificates, CredentialPersistence persistence)
- : m_user("")
- , m_password("")
- , m_persistence(persistence)
- , m_identity(identity)
- , m_certificates(certificates)
- , m_type(CredentialTypeClientCertificate)
-{
-}
-
-SecIdentityRef Credential::identity() const
-{
- return m_identity.get();
-}
-
-CFArrayRef Credential::certificates() const
-{
- return m_certificates.get();
-}
-
-CredentialType Credential::type() const
-{
- return m_type;
-}
-#endif
-
-bool operator==(const Credential& a, const Credential& b)
-{
- // Check persistence first since all credential types
- // have the persistence property.
- if (a.persistence() != b.persistence())
- return false;
-
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- CredentialType aType = a.type();
- if (aType != b.type())
- return false;
-
- // Comparing identity and certificate chain pointers is valid only
- // for client certificate type credentials.
- //
- // FIXME: Is pointer comparison of the identity and certificates properties sufficient?
- if (aType == CredentialTypeClientCertificate) {
- if (a.identity() != b.identity())
- return false;
- if (a.certificates() != b.certificates())
- return false;
-
- // We only need to check identity and certificates to compare
- // client certificate based credentials.
- return true;
- }
-
- ASSERT(a.type() == CredentialTypePassword && b.type() == CredentialTypePassword);
-#endif
-
- if (a.user() != b.user())
- return false;
- if (a.password() != b.password())
- return false;
-
- return true;
-}
-
-}
-
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCredentialh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/Credential.h (171721 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/Credential.h 2014-07-29 04:17:46 UTC (rev 171721)
+++ trunk/Source/WebCore/platform/network/Credential.h 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -22,69 +22,39 @@
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><ins>+
</ins><span class="cx"> #ifndef Credential_h
</span><span class="cx"> #define Credential_h
</span><span class="cx">
</span><del>-#include <wtf/text/WTFString.h>
</del><ins>+#include "CredentialBase.h"
</ins><span class="cx">
</span><del>-#define CERTIFICATE_CREDENTIALS_SUPPORTED (PLATFORM(COCOA))
-
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
-#include <Security/SecBase.h>
-#include <wtf/RetainPtr.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-enum CredentialPersistence {
- CredentialPersistenceNone,
- CredentialPersistenceForSession,
- CredentialPersistencePermanent
-};
</del><ins>+class Credential : public CredentialBase {
+public:
+ Credential()
+ : CredentialBase()
+ {
+ }
</ins><span class="cx">
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
-enum CredentialType {
- CredentialTypePassword,
- CredentialTypeClientCertificate
-};
-#endif
</del><ins>+ Credential(const String& user, const String& password, CredentialPersistence persistence)
+ : CredentialBase(user, password, persistence)
+ {
+ }
</ins><span class="cx">
</span><del>-class Credential {
</del><ins>+ Credential(const Credential& original, CredentialPersistence persistence)
+ : CredentialBase(original, persistence)
+ {
+ }
</ins><span class="cx">
</span><del>-public:
- Credential();
- Credential(const String& user, const String& password, CredentialPersistence);
- Credential(const Credential& original, CredentialPersistence);
</del><span class="cx"> #if CERTIFICATE_CREDENTIALS_SUPPORTED
</span><del>- Credential(SecIdentityRef identity, CFArrayRef certificates, CredentialPersistence);
</del><ins>+ Credential(SecIdentityRef identity, CFArrayRef certificates, CredentialPersistence persistence)
+ : CredentialBase(identity, certificates, persistence)
+ {
+ }
</ins><span class="cx"> #endif
</span><del>-
- bool isEmpty() const;
-
- const String& user() const;
- const String& password() const;
- bool hasPassword() const;
- CredentialPersistence persistence() const;
-
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- SecIdentityRef identity() const;
- CFArrayRef certificates() const;
- CredentialType type() const;
-#endif
-
-private:
- String m_user;
- String m_password;
- CredentialPersistence m_persistence;
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- RetainPtr<SecIdentityRef> m_identity;
- RetainPtr<CFArrayRef> m_certificates;
- CredentialType m_type;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><del>-bool operator==(const Credential& a, const Credential& b);
-inline bool operator!=(const Credential& a, const Credential& b) { return !(a == b); }
-
-};
-#endif
</del><ins>+}
+
+#endif // Credential_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCredentialBasecppfromrev171719trunkSourceWebCoreplatformnetworkCredentialcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/CredentialBase.cpp (from rev 171719, trunk/Source/WebCore/platform/network/Credential.cpp) (0 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CredentialBase.cpp (rev 0)
+++ trunk/Source/WebCore/platform/network/CredentialBase.cpp 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -0,0 +1,164 @@
</span><ins>+/*
+ * Copyright (C) 2007 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CredentialBase.h"
+
+#include "Credential.h"
+
+namespace WebCore {
+
+// Need to enforce empty, non-null strings due to the pickiness of the String == String operator
+// combined with the semantics of the String(NSString*) constructor
+CredentialBase::CredentialBase()
+ : m_user("")
+ , m_password("")
+ , m_persistence(CredentialPersistenceNone)
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+ , m_type(CredentialTypePassword)
+#endif
+{
+}
+
+// Need to enforce empty, non-null strings due to the pickiness of the String == String operator
+// combined with the semantics of the String(NSString*) constructor
+CredentialBase::CredentialBase(const String& user, const String& password, CredentialPersistence persistence)
+ : m_user(user.length() ? user : "")
+ , m_password(password.length() ? password : "")
+ , m_persistence(persistence)
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+ , m_type(CredentialTypePassword)
+#endif
+{
+}
+
+CredentialBase::CredentialBase(const Credential& original, CredentialPersistence persistence)
+ : m_user(original.user())
+ , m_password(original.password())
+ , m_persistence(persistence)
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+ , m_identity(original.identity())
+ , m_certificates(original.certificates())
+ , m_type(original.type())
+#endif
+{
+}
+
+bool CredentialBase::isEmpty() const
+{
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+ if (m_type == CredentialTypeClientCertificate && (m_identity || m_certificates))
+ return false;
+#endif
+
+ return m_user.isEmpty() && m_password.isEmpty();
+}
+
+const String& CredentialBase::user() const
+{
+ return m_user;
+}
+
+const String& CredentialBase::password() const
+{
+ return m_password;
+}
+
+bool CredentialBase::hasPassword() const
+{
+ return !m_password.isEmpty();
+}
+
+CredentialPersistence CredentialBase::persistence() const
+{
+ return m_persistence;
+}
+
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+CredentialBase::CredentialBase(SecIdentityRef identity, CFArrayRef certificates, CredentialPersistence persistence)
+ : m_user("")
+ , m_password("")
+ , m_persistence(persistence)
+ , m_identity(identity)
+ , m_certificates(certificates)
+ , m_type(CredentialTypeClientCertificate)
+{
+}
+
+SecIdentityRef CredentialBase::identity() const
+{
+ return m_identity.get();
+}
+
+CFArrayRef CredentialBase::certificates() const
+{
+ return m_certificates.get();
+}
+
+CredentialType CredentialBase::type() const
+{
+ return m_type;
+}
+#endif
+
+bool operator==(const Credential& a, const Credential& b)
+{
+ // Check persistence first since all credential types
+ // have the persistence property.
+ if (a.persistence() != b.persistence())
+ return false;
+
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+ CredentialType aType = a.type();
+ if (aType != b.type())
+ return false;
+
+ // Comparing identity and certificate chain pointers is valid only
+ // for client certificate type credentials.
+ //
+ // FIXME: Is pointer comparison of the identity and certificates properties sufficient?
+ if (aType == CredentialTypeClientCertificate) {
+ if (a.identity() != b.identity())
+ return false;
+ if (a.certificates() != b.certificates())
+ return false;
+
+ // We only need to check identity and certificates to compare
+ // client certificate based credentials.
+ return true;
+ }
+
+ ASSERT(a.type() == CredentialTypePassword && b.type() == CredentialTypePassword);
+#endif
+
+ if (a.user() != b.user())
+ return false;
+ if (a.password() != b.password())
+ return false;
+
+ return true;
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCredentialBasehfromrev171719trunkSourceWebCoreplatformnetworkCredentialh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/CredentialBase.h (from rev 171719, trunk/Source/WebCore/platform/network/Credential.h) (0 => 171722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CredentialBase.h (rev 0)
+++ trunk/Source/WebCore/platform/network/CredentialBase.h 2014-07-29 04:22:14 UTC (rev 171722)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+/*
+ * Copyright (C) 2007 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CredentialBase_h
+#define CredentialBase_h
+
+#include <wtf/text/WTFString.h>
+
+#define CERTIFICATE_CREDENTIALS_SUPPORTED (PLATFORM(COCOA))
+
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+#include <Security/SecBase.h>
+#include <wtf/RetainPtr.h>
+#endif
+
+namespace WebCore {
+
+class Credential;
+
+enum CredentialPersistence {
+ CredentialPersistenceNone,
+ CredentialPersistenceForSession,
+ CredentialPersistencePermanent
+};
+
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+enum CredentialType {
+ CredentialTypePassword,
+ CredentialTypeClientCertificate
+};
+#endif
+
+class CredentialBase {
+
+public:
+ bool isEmpty() const;
+
+ const String& user() const;
+ const String& password() const;
+ bool hasPassword() const;
+ CredentialPersistence persistence() const;
+
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+ SecIdentityRef identity() const;
+ CFArrayRef certificates() const;
+ CredentialType type() const;
+#endif
+
+protected:
+ CredentialBase();
+ CredentialBase(const String& user, const String& password, CredentialPersistence);
+ CredentialBase(const Credential& original, CredentialPersistence);
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+ CredentialBase(SecIdentityRef, CFArrayRef certificates, CredentialPersistence);
+#endif
+
+private:
+ String m_user;
+ String m_password;
+ CredentialPersistence m_persistence;
+#if CERTIFICATE_CREDENTIALS_SUPPORTED
+ RetainPtr<SecIdentityRef> m_identity;
+ RetainPtr<CFArrayRef> m_certificates;
+ CredentialType m_type;
+#endif
+};
+
+bool operator==(const Credential& a, const Credential& b);
+inline bool operator!=(const Credential& a, const Credential& b) { return !(a == b); }
+
+};
+#endif
</ins></span></pre>
</div>
</div>
</body>
</html>