Changeset 180603 in webkit

Timestamp:

Feb 24, 2015 6:31:22 PM (9 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Fix build break on EFL and GTK port since r180585.
​https://bugs.webkit.org/show_bug.cgi?id=141994

Reviewed by Joseph Pecoraro.

• UIProcess/WebsiteData/WebsiteDataRecord.cpp:

(WebKit::WebsiteDataRecord::displayNameForOrigin):

• UIProcess/WebsiteData/WebsiteDataRecord.h:

(WebKit::WebsiteDataRecord::WebsiteDataRecord):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataRecord.cpp (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataRecord.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-24  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Fix build break on EFL and GTK port since r180585.
+        https://bugs.webkit.org/show_bug.cgi?id=141994
+
+        Reviewed by Joseph Pecoraro.
+
+        * UIProcess/WebsiteData/WebsiteDataRecord.cpp:
+        (WebKit::WebsiteDataRecord::displayNameForOrigin):
+        * UIProcess/WebsiteData/WebsiteDataRecord.h:
+        (WebKit::WebsiteDataRecord::WebsiteDataRecord):
+
 2015-02-24  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp

@@ -41 +41 @@
     }
 
+#if ENABLE(PUBLIC_SUFFIX_LIST)
     if (protocol == "http" || protocol == "https")
         return WebCore::topPrivatelyControlledDomain(securityOrigin.host());
+#endif
 
     return String();

trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h

@@ -44 +44 @@
 
     String displayName;
-    unsigned types;
+    unsigned types { 0 };
     HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
 };