[GTK][WPE] Fix non-unified builds after r251326

https://bugs.webkit.org/show_bug.cgi?id=203244 Reviewed by Youenn Fablet. Source/JavaScriptCore: * ftl/FTLOSREntry.h: Add missing forward declaration of JSC::VM. * inspector/ScriptCallStackFactory.h: Add missing forward declaration of JSC::JSGlobalObject. * llint/LLIntExceptions.h: Add missing forward declaration of JSC::VM. * runtime/ExceptionFuzz.h: Add missing forward declaration of JSC::JSGlobalObject. * runtime/JSDateMath.h: Ditto. * runtime/JSStringJoiner.h: Add missing inclusion of the JSGlobalObject.h header. * runtime/Watchdog.h: Add missing forward declaration of JSC::JSGlobalObject. * wasm/WasmOperations.h: Add missing forward declaration of JSC::JSWebAssemblyInstance. Source/WebCore: No new tests needed. * Modules/async-clipboard/Clipboard.cpp: Switch inclusion of Blob.h to JSBlob.h, in order to have a toJS() conversion for Blob defined. Remove the unneeded JSPromise.h header inclusion. * Modules/indexeddb/IDBFactory.h: Add missing forward declaration of JSC::JSGlobalObject. * bindings/js/JSDOMBindingSecurity.h: Ditto. * bindings/js/ScriptState.h: Ditto. * dom/Node.cpp: Add missing inclusion of JavaScriptCore/HeapInlines.h * page/RemoteDOMWindow.h: Add missing forward declaration of JSC::JSGlobalObject. * platform/graphics/HEVCUtilities.cpp: Add missing inclusion of the wtf/text/StringHash.h header, needed to use String as key for a HashMap. Source/WebKit: * Shared/UserData.cpp: Add missing inclusion of WebCoreArgumentCoders.h * UIProcess/Automation/SimulatedInputDispatcher.cpp: Add missing inclusion of wtf/Variant.h * UIProcess/ProvisionalPageProxy.h: Add missing inclusion of WebCore/ResourceRequest.h * UIProcess/WebTextChecker.cpp: Add missing inclusion of WebPageProxy.h * WebProcess/Databases/WebDatabaseProvider.cpp: Add missing inclusion of WebIDBConnectionToServer.h Canonical link: https://commits.webkit.org/216673@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@251436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Oct 22, 2019 · 4450bb1 · 4450bb1
1 parent 1670007
commit 4450bb1
Show file tree

Hide file tree

Showing 23 changed files with 70 additions and 2 deletions.
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2019-10-22  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][WPE] Fix non-unified builds after r251326
+        https://bugs.webkit.org/show_bug.cgi?id=203244
+
+        Reviewed by Youenn Fablet.
+
+        * ftl/FTLOSREntry.h: Add missing forward declaration of JSC::VM.
+        * inspector/ScriptCallStackFactory.h: Add missing forward declaration of JSC::JSGlobalObject.
+        * llint/LLIntExceptions.h: Add missing forward declaration of JSC::VM.
+        * runtime/ExceptionFuzz.h: Add missing forward declaration of JSC::JSGlobalObject.
+        * runtime/JSDateMath.h: Ditto.
+        * runtime/JSStringJoiner.h: Add missing inclusion of the JSGlobalObject.h header.
+        * runtime/Watchdog.h: Add missing forward declaration of JSC::JSGlobalObject.
+        * wasm/WasmOperations.h: Add missing forward declaration of JSC::JSWebAssemblyInstance.
+
 2019-10-21  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Thread JSGlobalObject* instead of ExecState*

diff --git a/Source/JavaScriptCore/ftl/FTLOSREntry.h b/Source/JavaScriptCore/ftl/FTLOSREntry.h
@@ -31,6 +31,7 @@ namespace JSC {
 
 class CallFrame;
 class CodeBlock;
+class VM;
 
 namespace FTL {
 

diff --git a/Source/JavaScriptCore/inspector/ScriptCallStackFactory.h b/Source/JavaScriptCore/inspector/ScriptCallStackFactory.h
@@ -37,6 +37,7 @@
 namespace JSC {
 class CallFrame;
 class Exception;
+class JSGlobalObject;
 class JSValue;
 }
 

diff --git a/Source/JavaScriptCore/llint/LLIntExceptions.h b/Source/JavaScriptCore/llint/LLIntExceptions.h
@@ -30,6 +30,7 @@
 namespace JSC {
 
 class CallFrame;
+class VM;
 struct Instruction;
 
 namespace LLInt {

diff --git a/Source/JavaScriptCore/runtime/ExceptionFuzz.h b/Source/JavaScriptCore/runtime/ExceptionFuzz.h
@@ -30,6 +30,7 @@
 namespace JSC {
 
 class CallFrame;
+class JSGlobalObject;
 class ThrowScope;
 
 // Call this only if you know that exception fuzzing is enabled.

diff --git a/Source/JavaScriptCore/runtime/JSDateMath.h b/Source/JavaScriptCore/runtime/JSDateMath.h
@@ -48,6 +48,7 @@
 namespace JSC {
 
 class CallFrame;
+class JSGlobalObject;
 class VM;
 
 JS_EXPORT_PRIVATE void msToGregorianDateTime(VM&, double, WTF::TimeType outputTimeType, GregorianDateTime&);

diff --git a/Source/JavaScriptCore/runtime/JSStringJoiner.h b/Source/JavaScriptCore/runtime/JSStringJoiner.h
@@ -27,6 +27,7 @@
 
 #include "ExceptionHelpers.h"
 #include "JSCJSValue.h"
+#include "JSGlobalObject.h"
 
 namespace JSC {
 

diff --git a/Source/JavaScriptCore/runtime/Watchdog.h b/Source/JavaScriptCore/runtime/Watchdog.h
@@ -34,6 +34,7 @@
 namespace JSC {
 
 class CallFrame;
+class JSGlobalObject;
 class VM;
 
 class Watchdog : public WTF::ThreadSafeRefCounted<Watchdog> {

diff --git a/Source/JavaScriptCore/wasm/WasmOperations.h b/Source/JavaScriptCore/wasm/WasmOperations.h
@@ -30,6 +30,9 @@
 #include "SlowPathReturnType.h"
 
 namespace JSC {
+
+class JSWebAssemblyInstance;
+
 namespace Probe {
 class Context;
 } // namespace JSC::Probe

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2019-10-22  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][WPE] Fix non-unified builds after r251326
+        https://bugs.webkit.org/show_bug.cgi?id=203244
+
+        Reviewed by Youenn Fablet.
+
+        No new tests needed.
+
+        * Modules/async-clipboard/Clipboard.cpp: Switch inclusion of Blob.h to JSBlob.h, in order to
+        have a toJS() conversion for Blob defined. Remove the unneeded JSPromise.h header inclusion.
+        * Modules/indexeddb/IDBFactory.h: Add missing forward declaration of JSC::JSGlobalObject.
+        * bindings/js/JSDOMBindingSecurity.h: Ditto.
+        * bindings/js/ScriptState.h: Ditto.
+        * dom/Node.cpp: Add missing inclusion of JavaScriptCore/HeapInlines.h
+        * page/RemoteDOMWindow.h: Add missing forward declaration of JSC::JSGlobalObject.
+        * platform/graphics/HEVCUtilities.cpp: Add missing inclusion of the wtf/text/StringHash.h
+        header, needed to use String as key for a HashMap.
+
 2019-10-22  Miguel Gomez  <magomez@igalia.com>
 
         REGRESSION(r244372): [GTK][WPE] fast/images/icon-decoding.html and others are failing

diff --git a/Source/WebCore/Modules/async-clipboard/Clipboard.cpp b/Source/WebCore/Modules/async-clipboard/Clipboard.cpp
@@ -26,11 +26,10 @@
 #include "config.h"
 #include "Clipboard.h"
 
-#include "Blob.h"
 #include "ClipboardItem.h"
 #include "Frame.h"
+#include "JSBlob.h"
 #include "JSClipboardItem.h"
-#include "JSDOMPromise.h"
 #include "JSDOMPromiseDeferred.h"
 #include "Navigator.h"
 #include "Pasteboard.h"

diff --git a/Source/WebCore/Modules/indexeddb/IDBFactory.h b/Source/WebCore/Modules/indexeddb/IDBFactory.h
@@ -35,6 +35,7 @@
 
 namespace JSC {
 class CallFrame;
+class JSGlobalObject;
 class JSValue;
 }
 

diff --git a/Source/WebCore/bindings/js/JSDOMBindingSecurity.h b/Source/WebCore/bindings/js/JSDOMBindingSecurity.h
@@ -28,6 +28,7 @@
 
 namespace JSC {
 class CallFrame;
+class JSGlobalObject;
 }
 
 namespace WebCore {

diff --git a/Source/WebCore/bindings/js/ScriptState.h b/Source/WebCore/bindings/js/ScriptState.h
@@ -33,6 +33,7 @@
 
 namespace JSC {
 class CallFrame;
+class JSGlobalObject;
 }
 
 namespace WebCore {

diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
@@ -77,6 +77,7 @@
 #include "WheelEvent.h"
 #include "XMLNSNames.h"
 #include "XMLNames.h"
+#include <JavaScriptCore/HeapInlines.h>
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/SHA1.h>

diff --git a/Source/WebCore/page/RemoteDOMWindow.h b/Source/WebCore/page/RemoteDOMWindow.h
@@ -32,6 +32,7 @@
 
 namespace JSC {
 class CallFrame;
+class JSGlobalObject;
 class JSObject;
 class JSValue;
 template<typename> class Strong;

diff --git a/Source/WebCore/platform/graphics/HEVCUtilities.cpp b/Source/WebCore/platform/graphics/HEVCUtilities.cpp
@@ -29,6 +29,7 @@
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/NeverDestroyed.h>
+#include <wtf/text/StringHash.h>
 #include <wtf/text/StringToIntegerConversion.h>
 
 namespace WebCore {

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2019-10-22  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][WPE] Fix non-unified builds after r251326
+        https://bugs.webkit.org/show_bug.cgi?id=203244
+
+        Reviewed by Youenn Fablet.
+
+        * Shared/UserData.cpp: Add missing inclusion of WebCoreArgumentCoders.h
+        * UIProcess/Automation/SimulatedInputDispatcher.cpp: Add missing inclusion of wtf/Variant.h
+        * UIProcess/ProvisionalPageProxy.h: Add missing inclusion of WebCore/ResourceRequest.h
+        * UIProcess/WebTextChecker.cpp: Add missing inclusion of WebPageProxy.h
+        * WebProcess/Databases/WebDatabaseProvider.cpp: Add missing inclusion of WebIDBConnectionToServer.h
+
 2019-10-22  youenn fablet  <youenn@apple.com>
 
         WebSWServerToContextConnection should not assert when failing loads at destruction time

diff --git a/Source/WebKit/Shared/UserData.cpp b/Source/WebKit/Shared/UserData.cpp
@@ -45,6 +45,7 @@
 #include "Encoder.h"
 #include "ShareableBitmap.h"
 #include "WebCertificateInfo.h"
+#include "WebCoreArgumentCoders.h"
 #include "WebImage.h"
 #include "WebRenderLayer.h"
 #include "WebRenderObject.h"

diff --git a/Source/WebKit/UIProcess/Automation/SimulatedInputDispatcher.cpp b/Source/WebKit/UIProcess/Automation/SimulatedInputDispatcher.cpp
@@ -32,6 +32,7 @@
 #include "Logging.h"
 #include "WebAutomationSession.h"
 #include "WebAutomationSessionMacros.h"
+#include <wtf/Variant.h>
 
 namespace WebKit {
 

diff --git a/Source/WebKit/UIProcess/ProvisionalPageProxy.h b/Source/WebKit/UIProcess/ProvisionalPageProxy.h
@@ -30,6 +30,7 @@
 #include "WebFramePolicyListenerProxy.h"
 #include "WebPageProxyMessages.h"
 #include "WebsitePoliciesData.h"
+#include <WebCore/ResourceRequest.h>
 #include <wtf/WeakPtr.h>
 
 namespace API {

diff --git a/Source/WebKit/UIProcess/WebTextChecker.cpp b/Source/WebKit/UIProcess/WebTextChecker.cpp
@@ -28,6 +28,7 @@
 
 #include "TextChecker.h"
 #include "WKAPICast.h"
+#include "WebPageProxy.h"
 #include "WebProcessPool.h"
 #include <wtf/RefPtr.h>
 

diff --git a/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp b/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp
@@ -27,6 +27,7 @@
 #include "WebDatabaseProvider.h"
 
 #include "NetworkProcessConnection.h"
+#include "WebIDBConnectionToServer.h"
 #include "WebProcess.h"
 #include <wtf/HashMap.h>
 #include <wtf/NeverDestroyed.h>