Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

3 files changed, 30 insertions, 0 deletions

diff --git a/Source/WebCore/platform/haiku/CookieJarHaiku.cpp b/Source/WebCore/platform/haiku/CookieJarHaiku.cpp
index 471ac59..962846b 100644
--- a/Source/WebCore/platform/haiku/CookieJarHaiku.cpp
+++ b/Source/WebCore/platform/haiku/CookieJarHaiku.cpp
@@ -75,5 +75,20 @@ void deleteCookie(const Document*, const KURL&, const String&)
     // FIXME: Not yet implemented
 }
 
+void getHostnamesWithCookies(HashSet<String>& hostnames)
+{
+    // FIXME: Not yet implemented
+}
+
+void deleteCookiesForHostname(const String& hostname)
+{
+    // FIXME: Not yet implemented
+}
+
+void deleteAllCookies()
+{
+    // FIXME: Not yet implemented
+}
+
 } // namespace WebCore
 
diff --git a/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp b/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
index 5587fa2..63b9b91 100644
--- a/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
+++ b/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp
@@ -48,6 +48,11 @@ String resetButtonDefaultLabel()
     return "Reset";
 }
 
+String defaultDetailsSummaryText()
+{
+    return "Details";
+}
+
 String defaultLanguage()
 {
     return "en";
diff --git a/Source/WebCore/platform/haiku/TemporaryLinkStubs.cpp b/Source/WebCore/platform/haiku/TemporaryLinkStubs.cpp
index 58ab873..5ecb4f3 100644
--- a/Source/WebCore/platform/haiku/TemporaryLinkStubs.cpp
+++ b/Source/WebCore/platform/haiku/TemporaryLinkStubs.cpp
@@ -82,5 +82,15 @@ void setCookieStoragePrivateBrowsingEnabled(bool)
     notImplemented();
 }
 
+void startObservingCookieChanges()
+{
+    notImplemented();
+}
+
+void stopObservingCookieChanges()
+{
+    notImplemented();
+}
+
 } // namespace WebCore