Non-unified build fixes, mid October 2020

don.olmstead@sony.com · don.olmstead@sony.com · commit 184d6d1421ac · 2020-10-14T20:46:32.000Z
https://bugs.webkit.org/show_bug.cgi?id=217721 Reviewed by Yusuke Suzuki. Source/JavaScriptCore: * API/JSContextRef.cpp: * dfg/DFGDoesGCCheck.cpp: * llint/LLIntExceptions.cpp: * llint/LLIntExceptions.h: * llint/LLIntThunks.h: Source/WebCore: * Modules/webgpu/WebGPUShaderModule.h: * html/canvas/EXTTextureCompressionRGTC.cpp: * layout/floats/FloatingContext.cpp: * layout/floats/FloatingContext.h: * layout/inlineformatting/InlineFormattingContextGeometry.cpp: * layout/inlineformatting/InlineLine.cpp: * platform/graphics/gpu/GPUDevice.cpp: * rendering/RenderReplaced.cpp: * workers/WorkerRunLoop.cpp: Source/WebKit: * NetworkProcess/Downloads/DownloadManager.cpp: * UIProcess/Downloads/DownloadProxyMap.cpp: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@268485 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/API/JSContextRef.cpp b/Source/JavaScriptCore/API/JSContextRef.cpp
@@ -34,7 +34,7 @@
 #include "JSAPIWrapperObject.h"
 #include "JSCallbackObject.h"
 #include "JSClassRef.h"
-#include "JSObject.h"
+#include "JSObjectInlines.h"
 #include "StackVisitor.h"
 #include "StrongInlines.h"
 #include "StructureInlines.h"
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2020-10-14  Don Olmstead  <don.olmstead@sony.com>
+
+        Non-unified build fixes, mid October 2020
+        https://bugs.webkit.org/show_bug.cgi?id=217721
+
+        Reviewed by Yusuke Suzuki.
+
+        * API/JSContextRef.cpp:
+        * dfg/DFGDoesGCCheck.cpp:
+        * llint/LLIntExceptions.cpp:
+        * llint/LLIntExceptions.h:
+        * llint/LLIntThunks.h:
+
 2020-10-13  Saam Barati  <sbarati@apple.com>
 
         JSObject::getPropertyNames should have a stack overflow check
diff --git a/Source/JavaScriptCore/dfg/DFGDoesGCCheck.cpp b/Source/JavaScriptCore/dfg/DFGDoesGCCheck.cpp
@@ -31,6 +31,7 @@
 #include "DFGGraph.h"
 #include "DFGNodeType.h"
 #include "Heap.h"
+#include "JSCJSValueInlines.h"
 #include "Options.h"
 #include "VMInspector.h"
 #include <wtf/DataLog.h>
diff --git a/Source/JavaScriptCore/llint/LLIntExceptions.cpp b/Source/JavaScriptCore/llint/LLIntExceptions.cpp
@@ -28,6 +28,7 @@
 
 #include "LLIntCommon.h"
 #include "LLIntData.h"
+#include "LLIntThunks.h"
 
 #if LLINT_TRACING
 #include "CatchScope.h"
diff --git a/Source/JavaScriptCore/llint/LLIntExceptions.h b/Source/JavaScriptCore/llint/LLIntExceptions.h
@@ -25,13 +25,16 @@
 
 #pragma once
 
+#include "JSCPtrTag.h"
+#include "OpcodeSize.h"
 #include <wtf/StdLibExtras.h>
 
 namespace JSC {
 
 class CallFrame;
 class VM;
 struct Instruction;
+template<PtrTag> class MacroAssemblerCodeRef;
 
 namespace LLInt {
 
diff --git a/Source/JavaScriptCore/llint/LLIntThunks.h b/Source/JavaScriptCore/llint/LLIntThunks.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "MacroAssemblerCodeRef.h"
+#include "OpcodeSize.h"
 #include "VM.h"
 #include <wtf/Scope.h>
 
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2020-10-14  Don Olmstead  <don.olmstead@sony.com>
+
+        Non-unified build fixes, mid October 2020
+        https://bugs.webkit.org/show_bug.cgi?id=217721
+
+        Reviewed by Yusuke Suzuki.
+
+        * Modules/webgpu/WebGPUShaderModule.h:
+        * html/canvas/EXTTextureCompressionRGTC.cpp:
+        * layout/floats/FloatingContext.cpp:
+        * layout/floats/FloatingContext.h:
+        * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+        * layout/inlineformatting/InlineLine.cpp:
+        * platform/graphics/gpu/GPUDevice.cpp:
+        * rendering/RenderReplaced.cpp:
+        * workers/WorkerRunLoop.cpp:
+
 2020-10-14  Megan Gardner  <megan_gardner@apple.com>
 
         Refactor HighlightData
diff --git a/Source/WebCore/Modules/webgpu/WebGPUShaderModule.h b/Source/WebCore/Modules/webgpu/WebGPUShaderModule.h
@@ -28,8 +28,8 @@
 #if ENABLE(WEBGPU)
 
 #include "GPUShaderModule.h"
-#include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
diff --git a/Source/WebCore/html/canvas/EXTTextureCompressionRGTC.cpp b/Source/WebCore/html/canvas/EXTTextureCompressionRGTC.cpp
@@ -27,6 +27,7 @@
 
 #if ENABLE(WEBGL)
 #include "EXTTextureCompressionRGTC.h"
+#include "ExtensionsGL.h"
 
 #include <wtf/IsoMallocInlines.h>
 
diff --git a/Source/WebCore/layout/floats/FloatingContext.cpp b/Source/WebCore/layout/floats/FloatingContext.cpp
@@ -30,7 +30,6 @@
 
 #include "BlockFormattingState.h"
 #include "FloatAvoider.h"
-#include "FormattingContext.h"
 #include "LayoutBox.h"
 #include "LayoutBoxGeometry.h"
 #include "LayoutContainerBox.h"
diff --git a/Source/WebCore/layout/floats/FloatingContext.h b/Source/WebCore/layout/floats/FloatingContext.h
@@ -28,14 +28,14 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
 #include "FloatingState.h"
+#include "FormattingContext.h"
 #include "LayoutContainerBox.h"
 #include <wtf/IsoMalloc.h>
 
 namespace WebCore {
 namespace Layout {
 
 class FloatAvoider;
-class FormattingContext;
 class Box;
 class LayoutState;
 
diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp b/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp
@@ -28,6 +28,7 @@
 
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
+#include "FloatingContext.h"
 #include "FormattingContext.h"
 #include "InlineLineBox.h"
 #include "LayoutBox.h"
diff --git a/Source/WebCore/layout/inlineformatting/InlineLine.cpp b/Source/WebCore/layout/inlineformatting/InlineLine.cpp
@@ -28,6 +28,7 @@
 
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
+#include "FontCascade.h"
 #include "InlineFormattingContext.h"
 #include "InlineSoftLineBreakItem.h"
 #include "LayoutBoxGeometry.h"
diff --git a/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp b/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp
@@ -53,6 +53,7 @@
 #include <algorithm>
 #include <wtf/Optional.h>
 #include <wtf/text/StringConcatenate.h>
+#include <wtf/text/StringConcatenateNumbers.h>
 
 namespace WebCore {
 
diff --git a/Source/WebCore/rendering/RenderReplaced.cpp b/Source/WebCore/rendering/RenderReplaced.cpp
@@ -25,6 +25,7 @@
 #include "RenderReplaced.h"
 
 #include "DocumentMarkerController.h"
+#include "ElementRuleCollector.h"
 #include "FloatRoundedRect.h"
 #include "Frame.h"
 #include "GraphicsContext.h"
diff --git a/Source/WebCore/workers/WorkerRunLoop.cpp b/Source/WebCore/workers/WorkerRunLoop.cpp
@@ -37,6 +37,7 @@
 #include "ThreadTimers.h"
 #include "WorkerRunLoop.h"
 #include "WorkerOrWorkletGlobalScope.h"
+#include "WorkerOrWorkletScriptController.h"
 #include "WorkerThread.h"
 
 #if USE(GLIB)
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2020-10-14  Don Olmstead  <don.olmstead@sony.com>
+
+        Non-unified build fixes, mid October 2020
+        https://bugs.webkit.org/show_bug.cgi?id=217721
+
+        Reviewed by Yusuke Suzuki.
+
+        * NetworkProcess/Downloads/DownloadManager.cpp:
+        * UIProcess/Downloads/DownloadProxyMap.cpp:
+
 2020-10-14  Devin Rousso  <drousso@apple.com>
 
         REGRESSION (r268384): ASSERTION FAILED: _startCount > 1 in -[WKMouseDeviceObserver stop]
diff --git a/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp b/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "DownloadManager.h"
 
+#include "DataReference.h"
 #include "Download.h"
 #include "NetworkConnectionToWebProcess.h"
 #include "NetworkLoad.h"
diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp b/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "DownloadProxyMap.h"
 
+#include "APIDownloadClient.h"
 #include "AuxiliaryProcessProxy.h"
 #include "DownloadProxy.h"
 #include "DownloadProxyMessages.h"
