Changeset 286946 in webkit

Timestamp:

Dec 13, 2021, 5:42:48 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Unreviewed build fix after r286936

Source/JavaScriptCore:

• wasm/WasmOSREntryData.h: Replace wrong inclusion of wtf/Vector.h (unused) with the correct

wtf/FixedVector.h one.

• wasm/WasmTierUpCount.h: Add missing WasmOSREntryData.h inclusion.

Source/WebKit:

No new tests needed.

• NetworkProcess/storage/OriginStorageManager.cpp: Add missing inclusion of

MemoryStorageArea.h, which broke non-unified builds.

• NetworkProcess/storage/SQLiteStorageArea.cpp: Add missing inclusion of Logging.h, broke

the build in some configurations.

• NetworkProcess/storage/SessionStorageManager.h: Add missing inclusion of Connection.h, and

add missing forward declaration for WebCore::ClientOrigin, which broke the build for
non-Apple ports.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wasm/WasmOSREntryData.h (modified) (1 diff)
• JavaScriptCore/wasm/WasmTierUpCount.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/storage/OriginStorageManager.cpp (modified) (1 diff)
• WebKit/NetworkProcess/storage/SQLiteStorageArea.cpp (modified) (1 diff)
• WebKit/NetworkProcess/storage/SessionStorageManager.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-12-13  Adrian Perez de Castro  <aperez@igalia.com>
+
+        Unreviewed build fix after r286936
+
+        * wasm/WasmOSREntryData.h: Replace wrong inclusion of wtf/Vector.h (unused) with the correct
+        wtf/FixedVector.h one.
+        * wasm/WasmTierUpCount.h: Add missing WasmOSREntryData.h inclusion.
+
 2021-12-13  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/JavaScriptCore/wasm/WasmOSREntryData.h

@@ -30 +30 @@
 #include "B3Type.h"
 #include "B3ValueRep.h"
-#include <wtf/Vector.h>
+#include <wtf/FixedVector.h>
 
 namespace JSC { namespace Wasm {

trunk/Source/JavaScriptCore/wasm/WasmTierUpCount.h

@@ -31 +31 @@
 #include "ExecutionCounter.h"
 #include "Options.h"
+#include "WasmOSREntryData.h"
 #include <wtf/Atomics.h>
 #include <wtf/SegmentedVector.h>

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-13  Adrian Perez de Castro  <aperez@igalia.com>
+
+        Unreviewed build fix after r286936
+
+        No new tests needed.
+
+        * NetworkProcess/storage/OriginStorageManager.cpp: Add missing inclusion of
+        MemoryStorageArea.h, which broke non-unified builds.
+        * NetworkProcess/storage/SQLiteStorageArea.cpp: Add missing inclusion of Logging.h, broke
+        the build in some configurations.
+        * NetworkProcess/storage/SessionStorageManager.h: Add missing inclusion of Connection.h, and
+        add missing forward declaration for WebCore::ClientOrigin, which broke the build for
+        non-Apple ports.
+
 2021-12-13  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/NetworkProcess/storage/OriginStorageManager.cpp

@@ -30 +30 @@
 #include "FileSystemStorageManager.h"
 #include "LocalStorageManager.h"
+#include "MemoryStorageArea.h"
 #include "SessionStorageManager.h"
 #include "StorageAreaRegistry.h"

trunk/Source/WebKit/NetworkProcess/storage/SQLiteStorageArea.cpp

@@ -27 +27 @@
 #include "SQLiteStorageArea.h"
 
+#include "Logging.h"
 #include <WebCore/SQLiteFileSystem.h>
 #include <WebCore/SQLiteStatement.h>

trunk/Source/WebKit/NetworkProcess/storage/SessionStorageManager.h

@@ -26 +26 @@
 #pragma once
 
+#include "Connection.h"
 #include "StorageAreaIdentifier.h"
 #include "StorageNamespaceIdentifier.h"
+
+namespace WebCore {
+class ClientOrigin;
+} // namespace WebCore
 
 namespace WebKit {