Title: [235078] releases/WebKitGTK/webkit-2.22/Source/WebKit
Revision
235078
Author
carlo...@webkit.org
Date
2018-08-20 07:08:47 -0700 (Mon, 20 Aug 2018)

Log Message

Merge r235036 - Unreviewed. Fix GTK/WPE cookie API tests after r234396.

* UIProcess/WebsiteData/WebsiteDataRecord.cpp:
(WebKit::WebsiteDataRecord::displayNameForCookieHostName): Bring back the check to handle localhost as an
special case for non cocoa ports.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (235077 => 235078)


--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog	2018-08-20 14:08:41 UTC (rev 235077)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog	2018-08-20 14:08:47 UTC (rev 235078)
@@ -1,3 +1,11 @@
+2018-08-20  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Fix GTK/WPE cookie API tests after r234396.
+
+        * UIProcess/WebsiteData/WebsiteDataRecord.cpp:
+        (WebKit::WebsiteDataRecord::displayNameForCookieHostName): Bring back the check to handle localhost as an
+        special case for non cocoa ports.
+
 2018-08-17  Tim Horton  <timothy_hor...@apple.com>
 
         Start bringing up Unified Sources in WebKit2

Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp (235077 => 235078)


--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp	2018-08-20 14:08:41 UTC (rev 235077)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp	2018-08-20 14:08:47 UTC (rev 235078)
@@ -46,6 +46,9 @@
 #if PLATFORM(COCOA)
     if (hostName == String(kCFHTTPCookieLocalFileDomain))
         return displayNameForLocalFiles();
+#else
+    if (hostName == "localhost")
+        return hostName;
 #endif
     return displayNameForHostName(hostName);
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to