<!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>[171747] 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/171747">171747</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-07-29 09:40:17 -0700 (Tue, 29 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moved the Cocoa-specific parts of CredentialBase into a Cocoa-specific Credential class.
Work towards fixing https://bugs.webkit.org/show_bug.cgi?id=135327
Reviewed by Alexey Proskuryakov.
No change in functionality.
* WebCore.exp.in: Updated for functions moved in the class hierarchy.
* WebCore.xcodeproj/project.pbxproj: Added CredentialCocoa.{h,mm}.
* platform/network/Credential.h: For Cocoa, include CredentialCocoa.h instead of the generic
class.
(WebCore::Credential::Credential): Removed #if CERTIFICATE_CREDENTIALS_SUPPORTED code.
* platform/network/CredentialBase.cpp:
(WebCore::CredentialBase::CredentialBase): Changed to use emptyString instead of "", removed
#if CERTIFICATE_CREDENTIALS_SUPPORTED code.
(WebCore::CredentialBase::isEmpty): Ditto.
(WebCore::CredentialBase::compare): Renamed operator== to this, removed
#if CERTIFICATE_CREDENTIALS_SUPPORTED code, but changed the end to call platformCompare.
(WebCore::CredentialBase::identity): Deleted.
(WebCore::CredentialBase::certificates): Deleted.
(WebCore::CredentialBase::type): Deleted.
* platform/network/CredentialBase.h: Removed #if CERTIFICATE_CREDENTIALS_SUPPORTED members.
(WebCore::CredentialBase::platformCompare): Added a base implementation that returns true.
(WebCore::operator==): Changed to use CredentialBase::compare.
* platform/network/cocoa/CredentialCocoa.h: Added.
(WebCore::Credential::Credential):
* platform/network/cocoa/CredentialCocoa.mm: Added.
(WebCore::Credential::Credential): Moved the constructor that takes an identity and
certificates here.
(WebCore::Credential::isEmpty): Moved here.
(WebCore::Credential::identity): Ditto.
(WebCore::Credential::certificates): Ditto.
(WebCore::Credential::type): Ditto.
(WebCore::Credential::platformCompare): Moved the code that compares client-certificate
credentials here.
* platform/network/mac/AuthenticationMac.mm:
(WebCore::mac): Removed #if CERTIFICATE_CREDENTIALS_SUPPORTED guards in this Cocoa-only
file.
(WebCore::core): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCredentialh">trunk/Source/WebCore/platform/network/Credential.h</a></li>
<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>
<li><a href="#trunkSourceWebCoreplatformnetworkmacAuthenticationMacmm">trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaCredentialCocoah">trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaCredentialCocoamm">trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171746 => 171747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-29 15:47:39 UTC (rev 171746)
+++ trunk/Source/WebCore/ChangeLog 2014-07-29 16:40:17 UTC (rev 171747)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2014-07-29 Dan Bernstein <mitz@apple.com>
+
+ Moved the Cocoa-specific parts of CredentialBase into a Cocoa-specific Credential class.
+ Work towards fixing https://bugs.webkit.org/show_bug.cgi?id=135327
+
+ Reviewed by Alexey Proskuryakov.
+
+ No change in functionality.
+
+ * WebCore.exp.in: Updated for functions moved in the class hierarchy.
+
+ * WebCore.xcodeproj/project.pbxproj: Added CredentialCocoa.{h,mm}.
+
+ * platform/network/Credential.h: For Cocoa, include CredentialCocoa.h instead of the generic
+ class.
+ (WebCore::Credential::Credential): Removed #if CERTIFICATE_CREDENTIALS_SUPPORTED code.
+
+ * platform/network/CredentialBase.cpp:
+ (WebCore::CredentialBase::CredentialBase): Changed to use emptyString instead of "", removed
+ #if CERTIFICATE_CREDENTIALS_SUPPORTED code.
+ (WebCore::CredentialBase::isEmpty): Ditto.
+ (WebCore::CredentialBase::compare): Renamed operator== to this, removed
+ #if CERTIFICATE_CREDENTIALS_SUPPORTED code, but changed the end to call platformCompare.
+ (WebCore::CredentialBase::identity): Deleted.
+ (WebCore::CredentialBase::certificates): Deleted.
+ (WebCore::CredentialBase::type): Deleted.
+ * platform/network/CredentialBase.h: Removed #if CERTIFICATE_CREDENTIALS_SUPPORTED members.
+ (WebCore::CredentialBase::platformCompare): Added a base implementation that returns true.
+ (WebCore::operator==): Changed to use CredentialBase::compare.
+
+ * platform/network/cocoa/CredentialCocoa.h: Added.
+ (WebCore::Credential::Credential):
+ * platform/network/cocoa/CredentialCocoa.mm: Added.
+ (WebCore::Credential::Credential): Moved the constructor that takes an identity and
+ certificates here.
+ (WebCore::Credential::isEmpty): Moved here.
+ (WebCore::Credential::identity): Ditto.
+ (WebCore::Credential::certificates): Ditto.
+ (WebCore::Credential::type): Ditto.
+ (WebCore::Credential::platformCompare): Moved the code that compares client-certificate
+ credentials here.
+
+ * platform/network/mac/AuthenticationMac.mm:
+ (WebCore::mac): Removed #if CERTIFICATE_CREDENTIALS_SUPPORTED guards in this Cocoa-only
+ file.
+ (WebCore::core): Ditto.
+
</ins><span class="cx"> 2014-07-29 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Use WTF::move() instead of std::move() to help ensure move semantics
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (171746 => 171747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-07-29 15:47:39 UTC (rev 171746)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-07-29 16:40:17 UTC (rev 171747)
</span><span class="lines">@@ -1534,6 +1534,10 @@
</span><span class="cx"> __ZN7WebCore9unionRectERKN3WTF6VectorINS_9FloatRectELm0ENS0_15CrashOnOverflowEEE
</span><span class="cx"> __ZNK3JSC8Bindings10RootObject12globalObjectEv
</span><span class="cx"> __ZNK3WTF6String14createCFStringEv
</span><ins>+__ZNK7WebCore10Credential12certificatesEv
+__ZNK7WebCore10Credential4typeEv
+__ZNK7WebCore10Credential7isEmptyEv
+__ZNK7WebCore10Credential8identityEv
</ins><span class="cx"> __ZNK7WebCore10FloatPointcv7CGPointEv
</span><span class="cx"> __ZNK7WebCore10FontGlyphs17realizeFontDataAtERKNS_15FontDescriptionEj
</span><span class="cx"> __ZNK7WebCore10LayoutRect8containsERKS0_
</span><span class="lines">@@ -1653,11 +1657,7 @@
</span><span class="cx"> __ZNK7WebCore13ResourceErrorcvP7NSErrorEv
</span><span class="cx"> __ZNK7WebCore14CredentialBase11hasPasswordEv
</span><span class="cx"> __ZNK7WebCore14CredentialBase11persistenceEv
</span><del>-__ZNK7WebCore14CredentialBase12certificatesEv
-__ZNK7WebCore14CredentialBase4typeEv
</del><span class="cx"> __ZNK7WebCore14CredentialBase4userEv
</span><del>-__ZNK7WebCore14CredentialBase7isEmptyEv
-__ZNK7WebCore14CredentialBase8identityEv
</del><span class="cx"> __ZNK7WebCore14CredentialBase8passwordEv
</span><span class="cx"> __ZNK7WebCore14DocumentLoader10requestURLEv
</span><span class="cx"> __ZNK7WebCore14DocumentLoader11frameLoaderEv
</span><span class="lines">@@ -2219,6 +2219,7 @@
</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><ins>+__ZN7WebCore10CredentialC1EP20OpaqueSecIdentityRefPK9__CFArrayNS_21CredentialPersistenceE
</ins><span class="cx"> __ZN7WebCore10FloatPointC1ERK8_NSPoint
</span><span class="cx"> __ZN7WebCore10handCursorEv
</span><span class="cx"> __ZN7WebCore11CachedImage5imageEv
</span><span class="lines">@@ -2236,7 +2237,6 @@
</span><span class="cx"> __ZN7WebCore12EventHandler9mouseDownEP7NSEvent
</span><span class="cx"> __ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
</span><del>-__ZN7WebCore14CredentialBaseC2EP20OpaqueSecIdentityRefPK9__CFArrayNS_21CredentialPersistenceE
</del><span class="cx"> __ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_
</span><span class="cx"> __ZN7WebCore15GraphicsContext15drawNativeImageEP7CGImageRKNS_9FloatSizeENS_10ColorSpaceERKNS_9FloatRectES9_fNS_17CompositeOperatorENS_9BlendModeENS_16ImageOrientationE
</span><span class="cx"> __ZN7WebCore15GraphicsContextC1EP9CGContext
</span><span class="lines">@@ -2525,6 +2525,7 @@
</span><span class="cx"> _WebUIApplicationDidBecomeActiveNotification
</span><span class="cx"> _WebUIApplicationWillEnterForegroundNotification
</span><span class="cx"> _WebUIApplicationWillResignActiveNotification
</span><ins>+__ZN7WebCore10CredentialC1EP13__SecIdentityPK9__CFArrayNS_21CredentialPersistenceE
</ins><span class="cx"> __ZN7WebCore10RenderView35resumePausedImageAnimationsIfNeededEv
</span><span class="cx"> __ZN7WebCore10ScrollView15setScrollOffsetERKNS_8IntPointE
</span><span class="cx"> __ZN7WebCore10ScrollView21setExposedContentRectERKNS_9FloatRectE
</span><span class="lines">@@ -2561,7 +2562,6 @@
</span><span class="cx"> __ZN7WebCore13endOfSentenceERKNS_15VisiblePositionE
</span><span class="cx"> __ZN7WebCore13getRawCookiesERKNS_21NetworkStorageSessionERKNS_3URLES5_RN3WTF6VectorINS_6CookieELm0ENS6_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore13isStartOfLineERKNS_15VisiblePositionE
</span><del>-__ZN7WebCore14CredentialBaseC1EP13__SecIdentityPK9__CFArrayNS_21CredentialPersistenceE
</del><span class="cx"> __ZN7WebCore14DocumentLoader19setResponseMIMETypeERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore14DocumentWriter3endEv
</span><span class="cx"> __ZN7WebCore14FrameSelection13setCaretColorERKNS_5ColorE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (171746 => 171747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-29 15:47:39 UTC (rev 171746)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-29 16:40:17 UTC (rev 171747)
</span><span class="lines">@@ -1314,6 +1314,8 @@
</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><span class="cx"> 3792917A1985EF3900F4B661 /* CredentialBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 379291781985EF3900F4B661 /* CredentialBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 3792917D1987678F00F4B661 /* CredentialCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3792917B1987678F00F4B661 /* CredentialCocoa.mm */; };
+ 3792917E1987678F00F4B661 /* CredentialCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 3792917C1987678F00F4B661 /* CredentialCocoa.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">@@ -8340,6 +8342,8 @@
</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><span class="cx"> 379291781985EF3900F4B661 /* CredentialBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CredentialBase.h; sourceTree = "<group>"; };
</span><ins>+ 3792917B1987678F00F4B661 /* CredentialCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CredentialCocoa.mm; path = cocoa/CredentialCocoa.mm; sourceTree = "<group>"; };
+ 3792917C1987678F00F4B661 /* CredentialCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CredentialCocoa.h; path = cocoa/CredentialCocoa.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">@@ -16767,6 +16771,8 @@
</span><span class="cx"> 7E7DE1FE195CEF2D0035363B /* cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 3792917C1987678F00F4B661 /* CredentialCocoa.h */,
+ 3792917B1987678F00F4B661 /* CredentialCocoa.mm */,
</ins><span class="cx"> 372ADA37197F47B900FC501E /* ProtectionSpaceCocoa.h */,
</span><span class="cx"> 372ADA39197F687600FC501E /* ProtectionSpaceCocoa.mm */,
</span><span class="cx"> 7E7DE1FC195CEF260035363B /* ResourceRequestCocoa.mm */,
</span><span class="lines">@@ -25674,6 +25680,7 @@
</span><span class="cx"> BCEA4864097D93020094C9E4 /* RenderLineBreak.h in Headers */,
</span><span class="cx"> ABB5419F0ACDDFE4002820EB /* RenderListBox.h in Headers */,
</span><span class="cx"> A8EA7A520A191A5200A8EF5F /* RenderListItem.h in Headers */,
</span><ins>+ 3792917E1987678F00F4B661 /* CredentialCocoa.h in Headers */,
</ins><span class="cx"> A8EA7A500A191A5200A8EF5F /* RenderListMarker.h in Headers */,
</span><span class="cx"> 0F56028F0E4B76580065B038 /* RenderMarquee.h in Headers */,
</span><span class="cx"> 439046D812DA25E800AF80A2 /* RenderMathMLBlock.h in Headers */,
</span><span class="lines">@@ -28664,6 +28671,7 @@
</span><span class="cx"> B2FA3DC40AB75A6F000E5AC4 /* JSSVGPathSegCurvetoCubicSmoothRel.cpp in Sources */,
</span><span class="cx"> B2FA3DC60AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticAbs.cpp in Sources */,
</span><span class="cx"> B2FA3DC80AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticRel.cpp in Sources */,
</span><ins>+ 3792917D1987678F00F4B661 /* CredentialCocoa.mm in Sources */,
</ins><span class="cx"> B2FA3DCA0AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp in Sources */,
</span><span class="cx"> B2FA3DCC0AB75A6F000E5AC4 /* JSSVGPathSegCurvetoQuadraticSmoothRel.cpp in Sources */,
</span><span class="cx"> B2C96D8D0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCredentialh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/Credential.h (171746 => 171747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/Credential.h 2014-07-29 15:47:39 UTC (rev 171746)
+++ trunk/Source/WebCore/platform/network/Credential.h 2014-07-29 16:40:17 UTC (rev 171747)
</span><span class="lines">@@ -26,8 +26,15 @@
</span><span class="cx"> #ifndef Credential_h
</span><span class="cx"> #define Credential_h
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+#include "CredentialCocoa.h"
+#else
+
</ins><span class="cx"> #include "CredentialBase.h"
</span><span class="cx">
</span><ins>+// FIXME: Remove this macro once it is not used in WebKit.
+#define CERTIFICATE_CREDENTIALS_SUPPORTED 0
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Credential : public CredentialBase {
</span><span class="lines">@@ -46,15 +53,10 @@
</span><span class="cx"> : CredentialBase(original, persistence)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- Credential(SecIdentityRef identity, CFArrayRef certificates, CredentialPersistence persistence)
- : CredentialBase(identity, certificates, persistence)
- {
- }
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> #endif // Credential_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCredentialBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CredentialBase.cpp (171746 => 171747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CredentialBase.cpp 2014-07-29 15:47:39 UTC (rev 171746)
+++ trunk/Source/WebCore/platform/network/CredentialBase.cpp 2014-07-29 16:40:17 UTC (rev 171747)
</span><span class="lines">@@ -33,24 +33,18 @@
</span><span class="cx"> // Need to enforce empty, non-null strings due to the pickiness of the String == String operator
</span><span class="cx"> // combined with the semantics of the String(NSString*) constructor
</span><span class="cx"> CredentialBase::CredentialBase()
</span><del>- : m_user("")
- , m_password("")
</del><ins>+ : m_user(emptyString())
+ , m_password(emptyString())
</ins><span class="cx"> , m_persistence(CredentialPersistenceNone)
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- , m_type(CredentialTypePassword)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Need to enforce empty, non-null strings due to the pickiness of the String == String operator
</span><span class="cx"> // combined with the semantics of the String(NSString*) constructor
</span><span class="cx"> CredentialBase::CredentialBase(const String& user, const String& password, CredentialPersistence persistence)
</span><del>- : m_user(user.length() ? user : "")
- , m_password(password.length() ? password : "")
</del><ins>+ : m_user(user.length() ? user : emptyString())
+ , m_password(password.length() ? password : emptyString())
</ins><span class="cx"> , m_persistence(persistence)
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- , m_type(CredentialTypePassword)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -58,21 +52,11 @@
</span><span class="cx"> : m_user(original.user())
</span><span class="cx"> , m_password(original.password())
</span><span class="cx"> , m_persistence(persistence)
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- , m_identity(original.identity())
- , m_certificates(original.certificates())
- , m_type(original.type())
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CredentialBase::isEmpty() const
</span><span class="cx"> {
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- if (m_type == CredentialTypeClientCertificate && (m_identity || m_certificates))
- return false;
-#endif
-
</del><span class="cx"> return m_user.isEmpty() && m_password.isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -95,70 +79,19 @@
</span><span class="cx"> {
</span><span class="cx"> return m_persistence;
</span><span class="cx"> }
</span><del>-
-#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
</del><span class="cx">
</span><del>-bool operator==(const Credential& a, const Credential& b)
</del><ins>+bool CredentialBase::compare(const Credential& a, const Credential& b)
</ins><span class="cx"> {
</span><span class="cx"> // Check persistence first since all credential types
</span><span class="cx"> // have the persistence property.
</span><span class="cx"> if (a.persistence() != b.persistence())
</span><span class="cx"> return false;
</span><del>-
-#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
-
</del><span class="cx"> if (a.user() != b.user())
</span><span class="cx"> return false;
</span><span class="cx"> if (a.password() != b.password())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return true;
</del><ins>+ return Credential::platformCompare(a, b);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCredentialBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CredentialBase.h (171746 => 171747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CredentialBase.h 2014-07-29 15:47:39 UTC (rev 171746)
+++ trunk/Source/WebCore/platform/network/CredentialBase.h 2014-07-29 16:40:17 UTC (rev 171747)
</span><span class="lines">@@ -28,13 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><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><span class="cx"> class Credential;
</span><span class="lines">@@ -45,13 +38,6 @@
</span><span class="cx"> CredentialPersistencePermanent
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
-enum CredentialType {
- CredentialTypePassword,
- CredentialTypeClientCertificate
-};
-#endif
-
</del><span class="cx"> class CredentialBase {
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="lines">@@ -62,33 +48,24 @@
</span><span class="cx"> bool hasPassword() const;
</span><span class="cx"> CredentialPersistence persistence() const;
</span><span class="cx">
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- SecIdentityRef identity() const;
- CFArrayRef certificates() const;
- CredentialType type() const;
-#endif
-
</del><ins>+ static bool compare(const Credential&, const Credential&);
+
</ins><span class="cx"> protected:
</span><span class="cx"> CredentialBase();
</span><span class="cx"> CredentialBase(const String& user, const String& password, CredentialPersistence);
</span><span class="cx"> CredentialBase(const Credential& original, CredentialPersistence);
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
- CredentialBase(SecIdentityRef, CFArrayRef certificates, CredentialPersistence);
-#endif
-
</del><ins>+
+ static bool platformCompare(const Credential&, const Credential&) { return true; }
+
</ins><span class="cx"> private:
</span><span class="cx"> String m_user;
</span><span class="cx"> String m_password;
</span><span class="cx"> CredentialPersistence m_persistence;
</span><del>-#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);
</del><ins>+inline bool operator==(const Credential& a, const Credential& b) { return CredentialBase::compare(a, b); }
</ins><span class="cx"> inline bool operator!=(const Credential& a, const Credential& b) { return !(a == b); }
</span><span class="cx">
</span><span class="cx"> };
</span><ins>+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaCredentialCocoah"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.h (0 => 171747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.h (rev 0)
+++ trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.h 2014-07-29 16:40:17 UTC (rev 171747)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+/*
+ * Copyright (C) 2014 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. AND ITS CONTRIBUTORS ``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 ITS 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 CredentialCocoa_h
+#define CredentialCocoa_h
+
+#include "CredentialBase.h"
+#include <Security/SecBase.h>
+#include <wtf/RetainPtr.h>
+
+// FIXME: Remove this macro once it is not used in WebKit.
+#define CERTIFICATE_CREDENTIALS_SUPPORTED 1
+
+namespace WebCore {
+
+enum CredentialType {
+ CredentialTypePassword,
+ CredentialTypeClientCertificate
+};
+
+class Credential : public CredentialBase {
+public:
+ Credential()
+ : CredentialBase()
+ , m_type(CredentialTypePassword)
+ {
+ }
+
+ Credential(const String& user, const String& password, CredentialPersistence persistence)
+ : CredentialBase(user, password, persistence)
+ , m_type(CredentialTypePassword)
+ {
+ }
+
+ Credential(const Credential& original, CredentialPersistence persistence)
+ : CredentialBase(original, persistence)
+ , m_type(original.m_type)
+ {
+ }
+
+ Credential(SecIdentityRef, CFArrayRef certificates, CredentialPersistence);
+
+ bool isEmpty() const;
+
+ SecIdentityRef identity() const;
+ CFArrayRef certificates() const;
+ CredentialType type() const;
+
+ static bool platformCompare(const Credential&, const Credential&);
+
+private:
+ RetainPtr<SecIdentityRef> m_identity;
+ RetainPtr<CFArrayRef> m_certificates;
+ CredentialType m_type;
+};
+
+} // namespace WebCore
+
+#endif // CredentialCocoa_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaCredentialCocoamm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm (0 => 171747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm (rev 0)
+++ trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.mm 2014-07-29 16:40:17 UTC (rev 171747)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+/*
+ * Copyright (C) 2009, 2014 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ */
+
+#import "config.h"
+#import "CredentialCocoa.h"
+
+namespace WebCore {
+
+Credential::Credential(SecIdentityRef identity, CFArrayRef certificates, CredentialPersistence persistence)
+ : CredentialBase(emptyString(), emptyString(), persistence)
+ , m_identity(identity)
+ , m_certificates(certificates)
+ , m_type(CredentialTypeClientCertificate)
+{
+}
+
+bool Credential::isEmpty() const
+{
+ if (m_type == CredentialTypeClientCertificate && (m_identity || m_certificates))
+ return false;
+
+ return CredentialBase::isEmpty();
+}
+
+SecIdentityRef Credential::identity() const
+{
+ return m_identity.get();
+}
+
+CFArrayRef Credential::certificates() const
+{
+ return m_certificates.get();
+}
+
+CredentialType Credential::type() const
+{
+ return m_type;
+}
+
+bool Credential::platformCompare(const Credential& a, const Credential& b)
+{
+ if (a.type() != CredentialTypeClientCertificate || b.type() != CredentialTypeClientCertificate)
+ return a.type() == b.type();
+
+ // FIXME: Is pointer comparison of the identity and certificates properties sufficient?
+ if (a.identity() != b.identity())
+ return false;
+ if (a.certificates() != b.certificates())
+ return false;
+
+ return true;
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacAuthenticationMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm (171746 => 171747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm 2014-07-29 15:47:39 UTC (rev 171746)
+++ trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm 2014-07-29 16:40:17 UTC (rev 171747)
</span><span class="lines">@@ -242,14 +242,12 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
</del><span class="cx"> if (coreCredential.type() == CredentialTypeClientCertificate) {
</span><span class="cx"> return [[[NSURLCredential alloc] initWithIdentity:coreCredential.identity()
</span><span class="cx"> certificates:(NSArray *)coreCredential.certificates()
</span><span class="cx"> persistence:persistence]
</span><span class="cx"> autorelease];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return [[[NSURLCredential alloc] initWithUser:coreCredential.user()
</span><span class="cx"> password:coreCredential.password()
</span><span class="lines">@@ -278,11 +276,9 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
</del><span class="cx"> SecIdentityRef identity = [macCredential identity];
</span><span class="cx"> if (identity)
</span><span class="cx"> return Credential(identity, (CFArrayRef)[macCredential certificates], persistence);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return Credential([macCredential user], [macCredential password], persistence);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>