Title: [174877] trunk/Source/WebCore
- Revision
- 174877
- Author
- [email protected]
- Date
- 2014-10-20 00:09:44 -0700 (Mon, 20 Oct 2014)
Log Message
[Mac] Optimize cookiesForDOM() by filtering and serializing cookies in a single pass
https://bugs.webkit.org/show_bug.cgi?id=137869
Reviewed by Darin Adler.
Optimize cookiesForDOM() by filtering and serializing in 1 pass instead of 2.
Previously, when accessing document.cookie, we ended up doing the following:
1. Call wkHTTPCookiesForURL() to get an NSArray of NSHTTPCookies.
2. Call filterCookies() to filter out cookies that are httpOnly or with an
empty name, thus allocating a new NSMutableArray.
3. Call NSHTTPCookie's requestHeaderFieldsWithCookies() to serialize the
cookies
4. Construct a WTF::String from the NSString*
There were several inefficiencies here:
1. We needed to pre-filter the cookies and allocate a new NSMutableArray
before calling requestHeaderFieldsWithCookies()
2. requestHeaderFieldsWithCookies() does more things that we actually need.
It constructs a Dictionary of header fields, of which we query the
"Cookie" field, even though we merely want a ';'-separated string
representation of the cookies in "key=value" form.
With this patch, we now take care of the string serialization ourselves,
using a StringBuilder as it is trivial to do. This also allows us to filter
out the httpOnly/invalid cookies as we do the serialization instead of
having a first pass to do so.
When scrolling the http://www.apple.com/iphone/ entire page down, then up,
se were spending ~13.1% of the NetworkProcess time in cookiesForDOM()
(~96ms) on my machine. With the patch, we spend ~23% less time in
cookiesForDOM() (~74ms).
No new tests, no behavior change.
* platform/network/mac/CookieJarMac.mm:
(WebCore::cookiesForSession):
(WebCore::cookiesForDOM):
(WebCore::cookieRequestHeaderFieldValue):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174876 => 174877)
--- trunk/Source/WebCore/ChangeLog 2014-10-20 05:17:06 UTC (rev 174876)
+++ trunk/Source/WebCore/ChangeLog 2014-10-20 07:09:44 UTC (rev 174877)
@@ -1,3 +1,45 @@
+2014-10-20 Chris Dumez <[email protected]>
+
+ [Mac] Optimize cookiesForDOM() by filtering and serializing cookies in a single pass
+ https://bugs.webkit.org/show_bug.cgi?id=137869
+
+ Reviewed by Darin Adler.
+
+ Optimize cookiesForDOM() by filtering and serializing in 1 pass instead of 2.
+
+ Previously, when accessing document.cookie, we ended up doing the following:
+ 1. Call wkHTTPCookiesForURL() to get an NSArray of NSHTTPCookies.
+ 2. Call filterCookies() to filter out cookies that are httpOnly or with an
+ empty name, thus allocating a new NSMutableArray.
+ 3. Call NSHTTPCookie's requestHeaderFieldsWithCookies() to serialize the
+ cookies
+ 4. Construct a WTF::String from the NSString*
+
+ There were several inefficiencies here:
+ 1. We needed to pre-filter the cookies and allocate a new NSMutableArray
+ before calling requestHeaderFieldsWithCookies()
+ 2. requestHeaderFieldsWithCookies() does more things that we actually need.
+ It constructs a Dictionary of header fields, of which we query the
+ "Cookie" field, even though we merely want a ';'-separated string
+ representation of the cookies in "key=value" form.
+
+ With this patch, we now take care of the string serialization ourselves,
+ using a StringBuilder as it is trivial to do. This also allows us to filter
+ out the httpOnly/invalid cookies as we do the serialization instead of
+ having a first pass to do so.
+
+ When scrolling the http://www.apple.com/iphone/ entire page down, then up,
+ se were spending ~13.1% of the NetworkProcess time in cookiesForDOM()
+ (~96ms) on my machine. With the patch, we spend ~23% less time in
+ cookiesForDOM() (~74ms).
+
+ No new tests, no behavior change.
+
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::cookiesForSession):
+ (WebCore::cookiesForDOM):
+ (WebCore::cookieRequestHeaderFieldValue):
+
2014-10-19 Chris Dumez <[email protected]>
Kill toRenderedDocumentMarker() by using tighter typing
Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (174876 => 174877)
--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2014-10-20 05:17:06 UTC (rev 174876)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2014-10-20 07:09:44 UTC (rev 174877)
@@ -34,6 +34,7 @@
#import "URL.h"
#import "NetworkStorageSession.h"
#import "WebCoreSystemInterface.h"
+#import <wtf/text/StringBuilder.h>
enum {
NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3
@@ -69,26 +70,41 @@
return filteredCookies;
}
-String cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
+enum IncludeHTTPOnlyOrNot { DoNotIncludeHTTPOnly, IncludeHTTPOnly };
+static String cookiesForSession(const NetworkStorageSession& session, const URL& firstParty, const URL& url, IncludeHTTPOnlyOrNot includeHTTPOnly)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
NSArray *cookies = wkHTTPCookiesForURL(session.cookieStorage().get(), firstParty, url);
- return [[NSHTTPCookie requestHeaderFieldsWithCookies:filterCookies(cookies).get()] objectForKey:@"Cookie"];
+ StringBuilder cookiesBuilder;
+ for (NSHTTPCookie *cookie in cookies) {
+ if (![[cookie name] length])
+ continue;
+ if (!includeHTTPOnly && [cookie isHTTPOnly])
+ continue;
+
+ if (!cookiesBuilder.isEmpty())
+ cookiesBuilder.appendLiteral("; ");
+
+ cookiesBuilder.append(String([cookie name]));
+ cookiesBuilder.append('=');
+ cookiesBuilder.append(String([cookie value]));
+ }
+ return cookiesBuilder.toString();
+
END_BLOCK_OBJC_EXCEPTIONS;
return String();
}
+String cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
+{
+ return cookiesForSession(session, firstParty, url, DoNotIncludeHTTPOnly);
+}
+
String cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
{
- BEGIN_BLOCK_OBJC_EXCEPTIONS;
-
- NSArray *cookies = wkHTTPCookiesForURL(session.cookieStorage().get(), firstParty, url);
- return [[NSHTTPCookie requestHeaderFieldsWithCookies:cookies] objectForKey:@"Cookie"];
-
- END_BLOCK_OBJC_EXCEPTIONS;
- return String();
+ return cookiesForSession(session, firstParty, url, IncludeHTTPOnly);
}
void setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& cookieStr)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
