Fixed missing headers from Webcore for Webkit2

Source/WTF/wtf/PlatformHaiku.cmake

@@ -11,6 +11,7 @@ LIST(APPEND WTF_SOURCES
     posix/ThreadingPOSIX.cpp
 
     unicode/icu/CollatorICU.cpp
+    UniStdExtras.cpp
 
     unix/CPUTimeUnix.cpp
 

Source/WebCore/PlatformHaiku.cmake

@@ -398,6 +398,8 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
 
     css/parser
 
+    inspector/agents
+
     html/canvas
     html/forms
     html/parser
@@ -408,6 +410,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     loader/archive
     loader/cache
     loader/icon
+    loader/archive/mhtml
 
 
     page/animation
@@ -438,7 +441,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
 
     platform/text/transcoder
 
-   PAL/pal
+    PAL/pal
 
     rendering/line
     rendering/shapes

Source/WebCore/platform/graphics/haiku/ImageBufferHaiku.cpp

@@ -32,8 +32,8 @@
 #include "MIMETypeRegistry.h"
 #include "NotImplemented.h"
 #include "StillImageHaiku.h"
-#include "JavaScriptCore/GenericTypedArrayViewInlines.h"
-#include "JavaScriptCore/JSGenericTypedArrayView.h"
+#include "JavaScriptCore/JSCInlines.h"
+#include "JavaScriptCore/TypedArrayInlines.h"
 
 #include <wtf/text/Base64.h>
 #include <wtf/text/CString.h>

Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp

@@ -36,9 +36,4 @@ String contextMenuItemTagSearchWeb()
     return String::fromUTF8("_Search the Web");
 }
 
-String localizedString(const char* key)
-{
-    return String::fromUTF8(key, strlen(key));
-}
-
 };

Source/WebCore/platform/network/haiku/CookieJarHaiku.cpp

@@ -56,7 +56,7 @@ void startObservingCookieChanges(const NetworkStorageSession& storageSession, WT
     notImplemented();
 }
 
-void stopObservingCookieChanges()
+void stopObservingCookieChanges(const NetworkStorageSession& storageSession)
 {
 }
 

Source/WebCore/platform/network/haiku/ProxyServerHaiku.cpp

@@ -30,7 +30,7 @@
 
 namespace WebCore {
 
-Vector<ProxyServer> proxyServersForURL(const URL&, const NetworkingContext*)
+Vector<ProxyServer> proxyServersForURL(const URL&)
 {
     // FIXME: Implement.
     return Vector<ProxyServer>();

Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp

@@ -27,9 +27,9 @@
 
 #include <cstdlib>
 
-#if USE(GCRYPT)
+/*#if USE(GCRYPT)
 #include <pal/crypto/gcrypt/Initialization.h>
-#endif
+#endif*/
 
 using namespace WebKit;
 
@@ -45,9 +45,9 @@ int main(int argc, char** argv)
     // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp.
     setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0);
 
-#if USE(GCRYPT)
+/*#if USE(GCRYPT)
     PAL::GCrypt::initialize();
-#endif
+#endif*/
 
     return NetworkProcessMainUnix(argc, argv);
 }

Source/WebKit/UIProcess/haiku/WebContextHaiku.cpp → Source/WebKit/NetworkProcess/cache/NetworkCacheDataHaiku.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Haiku, inc.
+ * Copyright (C) 2019 Haiku, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +10,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
@@ -24,65 +24,58 @@
  */
 
 #include "config.h"
-#include "WebCookieManagerProxy.h"
-#include "WebContext.h"
+#include "NetworkCacheData.h"
 
 #include "NotImplemented.h"
-#include <WebCore/IconDatabase.h>
 
 namespace WebKit {
+namespace NetworkCache {
 
-void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
+Data::Data(const uint8_t* data, size_t size)
 {
     notImplemented();
 }
 
-void WebContext::platformInvalidateContext()
+Data Data::empty()
 {
     notImplemented();
+    return { };
 }
 
-String WebContext::platformDefaultWebSQLDatabaseDirectory()
+const uint8_t* Data::data() const
 {
     notImplemented();
-    return "/WebKitEfl/Databases";
+    return nullptr;
 }
 
-String WebContext::platformDefaultIndexedDBDatabaseDirectory()
+bool Data::isNull() const
 {
     notImplemented();
-    return String();
+    return true;
 }
 
-String WebContext::platformDefaultIconDatabasePath() const
+bool Data::apply(const Function<bool(const uint8_t*, size_t)>& applier) const
 {
     notImplemented();
-    return "/WebKitEfl/IconDatabase/" + WebCore::IconDatabase::defaultDatabaseFilename();
+    return false;
 }
 
-String WebContext::platformDefaultLocalStorageDirectory()
+Data Data::subrange(size_t offset, size_t size) const
 {
-    notImplemented();
-    return "/WebKitEfl/LocalStorage";
+    return { };
 }
 
-String WebContext::platformDefaultDiskCacheDirectory() const
+Data concatenate(const Data& a, const Data& b)
 {
     notImplemented();
-    return "/WebKitEfl";
+    return { };
 }
 
-String WebContext::platformDefaultCookieStorageDirectory() const
+Data Data::adoptMap(void* map, size_t size, int fd)
 {
     notImplemented();
-    return String();
+    return { };
 }
 
-
-String WebContext::platformDefaultApplicationCacheDirectory() const
-{
-    notImplemented();
-    return "/WebKitEfl/Applications";
-}
-
-}
+} // namespace NetworkCache
+} // namespace WebKit

Source/WebKit/NetworkProcess/cache/NetworkCacheIOChannelHaiku.cpp

@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2019 Haiku Inc.,
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NetworkCacheIOChannel.h"
+
+#include "NotImplemented.h"
+
+namespace WebKit {
+namespace NetworkCache {
+
+IOChannel::IOChannel(const String& filePath, Type type)
+    : m_path{filePath}
+    , m_type{type}
+{
+    notImplemented();
+}
+
+IOChannel::~IOChannel()
+{
+}
+
+Ref<IOChannel> IOChannel::open(const String& filePath, IOChannel::Type type)
+{
+    return adoptRef(*new IOChannel(filePath, type));
+}
+
+void IOChannel::read(size_t offset, size_t size, WorkQueue* queue, Function<void(Data&, int error)>&& completionHandler)
+{
+    notImplemented();
+}
+
+void IOChannel::write(size_t offset, const Data& data, WorkQueue* queue, Function<void(int error)>&& completionHandler)
+{
+    notImplemented();
+}
+
+} // namespace NetworkCache
+} // namespace WebKit

Source/WebKit/NetworkProcess/haiku/NetworkProcessHaiku.cpp

@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2019 Haiku, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NetworkProcess.h"
+
+#include "NetworkProcessCreationParameters.h"
+#include <WebCore/NetworkStorageSession.h>
+#include <WebCore/NotImplemented.h>
+
+namespace WebCore
+{
+	class NetworkStorageSession;
+}
+
+namespace WebKit {
+
+using namespace WebCore;
+
+void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
+{
+    notImplemented();
+}
+
+void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
+{
+    notImplemented();
+}
+
+std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::platformCreateDefaultStorageSession() const
+{
+    return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), nullptr);
+}
+
+void NetworkProcess::platformProcessDidTransitionToForeground()
+{
+    notImplemented();
+}
+
+void NetworkProcess::platformProcessDidTransitionToBackground()
+{
+    notImplemented();
+}
+
+void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
+{
+    notImplemented();
+}
+
+void NetworkProcess::platformProcessDidResume()
+{
+    notImplemented();
+}
+
+void NetworkProcess::platformTerminate()
+{
+    notImplemented();
+}
+
+void NetworkProcess::platformPrepareToSuspend(CompletionHandler<void()>&& completionHandler)
+{
+    notImplemented();
+    completionHandler();
+}
+
+void NetworkProcess::clearDiskCache(WallTime modifiedSince, CompletionHandler<void()>&& completionHandler)
+{
+    notImplemented();
+}
+
+} // namespace WebKit

Source/WebKit/NetworkProcess/haiku/NetworkProcessMainHaiku.cpp

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 Haiku, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NetworkProcessMainUnix.h"
+
+#include "AuxiliaryProcessMain.h"
+#include "NetworkProcess.h"
+
+namespace WebKit {
+
+template<>
+void initializeAuxiliaryProcess<NetworkProcess>(AuxiliaryProcessInitializationParameters&& parameters)
+{
+    static NeverDestroyed<NetworkProcess> networkProcess(WTFMove(parameters));
+}
+
+int NetworkProcessMainUnix(int argc, char** argv)
+{
+    return AuxiliaryProcessMain<NetworkProcess, AuxiliaryProcessMainBase>(argc, argv);
+}
+
+} // namespace WebKit