Title: [171600] trunk/Source/WebCore
- Revision
- 171600
- Author
- [email protected]
- Date
- 2014-07-25 09:41:21 -0700 (Fri, 25 Jul 2014)
Log Message
ResourceErrorBase::compare doesn’t call the right platformCompare override
https://bugs.webkit.org/show_bug.cgi?id=135240
Reviewed by Alexey Proskuryakov.
* platform/network/ResourceErrorBase.cpp:
(WebCore::ResourceErrorBase::compare): Changed to call ResourceError::platformCompare.
* platform/network/cf/ResourceError.h: Made platformCompare public.
* platform/network/soup/ResourceError.h: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171599 => 171600)
--- trunk/Source/WebCore/ChangeLog 2014-07-25 16:39:59 UTC (rev 171599)
+++ trunk/Source/WebCore/ChangeLog 2014-07-25 16:41:21 UTC (rev 171600)
@@ -1,5 +1,17 @@
2014-07-25 Dan Bernstein <[email protected]>
+ ResourceErrorBase::compare doesn’t call the right platformCompare override
+ https://bugs.webkit.org/show_bug.cgi?id=135240
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/network/ResourceErrorBase.cpp:
+ (WebCore::ResourceErrorBase::compare): Changed to call ResourceError::platformCompare.
+ * platform/network/cf/ResourceError.h: Made platformCompare public.
+ * platform/network/soup/ResourceError.h: Ditto.
+
+2014-07-25 Dan Bernstein <[email protected]>
+
[Cocoa] WebProtectionSpace::receivesCredentialSecurely incorrectly returns false in some cases
https://bugs.webkit.org/show_bug.cgi?id=135241
Modified: trunk/Source/WebCore/platform/network/ResourceErrorBase.cpp (171599 => 171600)
--- trunk/Source/WebCore/platform/network/ResourceErrorBase.cpp 2014-07-25 16:39:59 UTC (rev 171599)
+++ trunk/Source/WebCore/platform/network/ResourceErrorBase.cpp 2014-07-25 16:41:21 UTC (rev 171600)
@@ -78,7 +78,7 @@
if (a.isTimeout() != b.isTimeout())
return false;
- return platformCompare(a, b);
+ return ResourceError::platformCompare(a, b);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/network/cf/ResourceError.h (171599 => 171600)
--- trunk/Source/WebCore/platform/network/cf/ResourceError.h 2014-07-25 16:39:59 UTC (rev 171599)
+++ trunk/Source/WebCore/platform/network/cf/ResourceError.h 2014-07-25 16:41:21 UTC (rev 171600)
@@ -78,13 +78,13 @@
operator NSError *() const;
#endif
+ static bool platformCompare(const ResourceError& a, const ResourceError& b);
+
private:
friend class ResourceErrorBase;
void platformLazyInit();
void platformCopy(ResourceError&) const;
- static bool platformCompare(const ResourceError& a, const ResourceError& b);
-
bool m_dataIsUpToDate;
#if USE(CFNETWORK)
mutable RetainPtr<CFErrorRef> m_platformError;
Modified: trunk/Source/WebCore/platform/network/soup/ResourceError.h (171599 => 171600)
--- trunk/Source/WebCore/platform/network/soup/ResourceError.h 2014-07-25 16:39:59 UTC (rev 171599)
+++ trunk/Source/WebCore/platform/network/soup/ResourceError.h 2014-07-25 16:41:21 UTC (rev 171600)
@@ -64,9 +64,10 @@
GTlsCertificate* certificate() const { return m_certificate.get(); }
void setCertificate(GTlsCertificate* certificate) { m_certificate = certificate; }
+ static bool platformCompare(const ResourceError& a, const ResourceError& b);
+
private:
void platformCopy(ResourceError&) const;
- static bool platformCompare(const ResourceError& a, const ResourceError& b);
unsigned m_tlsErrors;
GRefPtr<GTlsCertificate> m_certificate;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
