Title: [169981] trunk/Source/WebCore
- Revision
- 169981
- Author
- [email protected]
- Date
- 2014-06-14 14:35:56 -0700 (Sat, 14 Jun 2014)
Log Message
Simplify ResourceRequest constructors
https://bugs.webkit.org/show_bug.cgi?id=133911
Reviewed by Sam Weinig.
* platform/network/cf/ResourceRequest.h:
(WebCore::ResourceRequest::ResourceRequest):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169980 => 169981)
--- trunk/Source/WebCore/ChangeLog 2014-06-14 20:57:44 UTC (rev 169980)
+++ trunk/Source/WebCore/ChangeLog 2014-06-14 21:35:56 UTC (rev 169981)
@@ -1,3 +1,13 @@
+2014-06-14 Anders Carlsson <[email protected]>
+
+ Simplify ResourceRequest constructors
+ https://bugs.webkit.org/show_bug.cgi?id=133911
+
+ Reviewed by Sam Weinig.
+
+ * platform/network/cf/ResourceRequest.h:
+ (WebCore::ResourceRequest::ResourceRequest):
+
2014-06-14 Benjamin Poulain <[email protected]>
Fix the ARM64 build
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (169980 => 169981)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-06-14 20:57:44 UTC (rev 169980)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-06-14 21:35:56 UTC (rev 169981)
@@ -43,34 +43,22 @@
public:
ResourceRequest(const String& url)
: ResourceRequestBase(URL(ParsedURLString, url), UseProtocolCachePolicy)
-#if PLATFORM(IOS)
- , m_mainResourceRequest(false)
-#endif
{
}
ResourceRequest(const URL& url)
: ResourceRequestBase(url, UseProtocolCachePolicy)
-#if PLATFORM(IOS)
- , m_mainResourceRequest(false)
-#endif
{
}
ResourceRequest(const URL& url, const String& referrer, ResourceRequestCachePolicy policy = UseProtocolCachePolicy)
: ResourceRequestBase(url, policy)
-#if PLATFORM(IOS)
- , m_mainResourceRequest(false)
-#endif
{
setHTTPReferrer(referrer);
}
ResourceRequest()
: ResourceRequestBase(URL(), UseProtocolCachePolicy)
-#if PLATFORM(IOS)
- , m_mainResourceRequest(false)
-#endif
{
}
@@ -82,9 +70,6 @@
ResourceRequest(CFURLRequestRef cfRequest)
: ResourceRequestBase()
-#if PLATFORM(IOS)
- , m_mainResourceRequest(false)
-#endif
, m_cfRequest(cfRequest)
{
#if PLATFORM(COCOA)
@@ -94,9 +79,6 @@
#else
ResourceRequest(NSURLRequest *nsRequest)
: ResourceRequestBase()
-#if PLATFORM(IOS)
- , m_mainResourceRequest(false)
-#endif
, m_nsRequest(nsRequest)
{
}
@@ -135,7 +117,7 @@
bool isMainResourceRequest() const { return m_mainResourceRequest; }
private:
- mutable bool m_mainResourceRequest;
+ mutable bool m_mainResourceRequest = false;
#endif
private:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
