Skip to content
Permalink
Browse files
Remove Variant.h
https://bugs.webkit.org/show_bug.cgi?id=231744

Patch by Alex Christensen <achristensen@webkit.org> on 2021-10-14
Reviewed by Darin Adler.

Source/JavaScriptCore:

* jit/AssemblyHelpers.h:
* jit/SnippetReg.h:
* parser/Lexer.cpp:
* parser/VariableEnvironment.h:
* runtime/BytecodeCacheError.h:
* runtime/CachePayload.h:
* runtime/CacheUpdate.h:
* runtime/TemporalObject.h:
* runtime/TemporalTimeZone.h:
* wasm/WasmLLIntGenerator.cpp:

Source/WebCore:

* Modules/async-clipboard/ClipboardItemBindingsDataSource.h:
* Modules/fetch/FetchBody.h:
* Modules/fetch/FetchHeaders.h:
* Modules/indexeddb/IDBCursor.h:
* Modules/indexeddb/IDBGetAllResult.h:
* Modules/indexeddb/IDBKey.h:
* Modules/indexeddb/IDBKeyData.h:
* Modules/indexeddb/IDBKeyPath.h:
* Modules/indexeddb/IDBRequest.cpp:
* Modules/mediacontrols/MediaControlsHost.cpp:
* Modules/mediacontrols/MediaControlsHost.h:
* Modules/mediastream/MediaTrackConstraints.h:
* Modules/mediastream/RTCIceServer.h:
* Modules/paymentrequest/PaymentMethodChangeEvent.h:
* Modules/paymentrequest/PaymentRequest.h:
* Modules/push-api/PushEventInit.h:
* Modules/push-api/PushSubscription.h:
* Modules/push-api/PushSubscriptionOptionsInit.h:
* Modules/speech/SpeechRecognitionUpdate.h:
* Modules/webaudio/AudioContextOptions.h:
* Modules/webaudio/AudioNode.h:
* Modules/webxr/WebXRWebGLLayer.h:
* accessibility/AccessibilityObjectInterface.h:
* accessibility/isolatedtree/AXIsolatedObject.h:
* accessibility/mac/WebAccessibilityObjectWrapperBase.h:
* animation/AnimationEffect.h:
* animation/EffectTiming.h:
* animation/OptionalEffectTiming.h:
* bindings/IDLTypes.h:
* bindings/js/BufferSource.h:
* bindings/js/JSDOMConvertUnion.h:
* bindings/js/JSValueInWrappedObject.h:
* bindings/scripts/CodeGeneratorJS.pm:
(AddToIncludesForIDLType):
* crypto/CryptoAlgorithm.h:
* crypto/CryptoKey.h:
* crypto/SubtleCrypto.h:
* crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
* crypto/algorithms/CryptoAlgorithmHMAC.cpp:
* crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp:
* crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp:
* crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp:
* crypto/algorithms/CryptoAlgorithmRSA_PSS.cpp:
* crypto/parameters/CryptoAlgorithmEcdsaParams.h:
* crypto/parameters/CryptoAlgorithmHmacKeyParams.h:
* crypto/parameters/CryptoAlgorithmRsaHashedImportParams.h:
* crypto/parameters/CryptoAlgorithmRsaHashedKeyGenParams.h:
* css/CSSCustomPropertyValue.h:
* css/CSSFontFaceSet.h:
* css/CSSStyleDeclaration.cpp:
* css/DOMMatrixReadOnly.h:
* css/FontFace.h:
* css/StyleRule.h:
* css/parser/CSSPropertyParserHelpers.h:
* css/typedom/CSSNumericValue.h:
* css/typedom/CSSUnparsedValue.cpp:
* css/typedom/CSSUnparsedValue.h:
* dom/ContainerNode.cpp:
* dom/DocumentMarker.h:
* dom/EventTarget.h:
* dom/MessageEvent.h:
* dom/Node.cpp:
* editing/AlternativeTextController.h:
* fileapi/Blob.h:
* fileapi/NetworkSendQueue.h:
* html/DOMFormData.h:
* html/HTMLAllCollection.cpp:
* html/ImageBitmap.cpp:
* html/URLSearchParams.h:
* html/canvas/CanvasStyle.h:
* inspector/InspectorCanvas.cpp:
* inspector/InspectorCanvas.h:
* inspector/InspectorCanvasCallTracer.cpp:
* inspector/InspectorShaderProgram.cpp:
* inspector/InspectorShaderProgram.h:
* inspector/agents/InspectorCanvasAgent.cpp:
* layout/integration/InlineIteratorBox.h:
* layout/integration/InlineIteratorLine.h:
* page/DOMWindow.cpp:
* page/DiagnosticLoggingClient.h:
* page/IntersectionObserver.h:
* page/Performance.h:
* page/PerformanceMeasureOptions.h:
* page/scrolling/ScrollingCoordinator.h:
* platform/PasteboardCustomData.h:
* platform/SharedBuffer.h:
* platform/audio/AudioStreamDescription.h:
* platform/generic/KeyedDecoderGeneric.cpp:
* platform/graphics/DecodingOptions.h:
* platform/graphics/FontCascadeDescription.h:
* platform/graphics/FontPalette.h:
* platform/graphics/FontPaletteValues.h:
* platform/graphics/Gradient.h:
* platform/graphics/InlinePathData.h:
* platform/graphics/cocoa/SourceBufferParser.h:
* platform/graphics/cocoa/SourceBufferParserWebM.h:
* platform/graphics/displaylists/DisplayListItems.h:
* platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:
* platform/network/DNS.h:
* platform/network/FormData.h:
* platform/network/curl/CurlSSLHandle.h:
* platform/sql/SQLValue.h:
* platform/sql/SQLiteStatement.cpp:
* platform/xr/PlatformXR.h:
* testing/TypeConversions.h:
* workers/service/ExtendableMessageEvent.h:
* workers/service/ServiceWorkerTypes.h:
* xml/XMLHttpRequest.h:

Source/WebKit:

* NetworkProcess/NetworkLoadChecker.h:
* NetworkProcess/cache/NetworkCacheData.h:
* Platform/IPC/ArgumentCoders.h:
* Platform/IPC/Attachment.h:
* Platform/IPC/MessageReceiveQueueMap.h:
* Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb:
* Shared/WebCompiledContentRuleListData.h:
* Shared/mac/MediaFormatReader/MediaSampleCursor.cpp:
* Shared/mac/MediaFormatReader/MediaSampleCursor.h:
* UIProcess/API/APIWebAuthenticationPanel.h:
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/API/wpe/TouchGestureController.h:
* UIProcess/Automation/SimulatedInputDispatcher.cpp:
* UIProcess/Automation/SimulatedInputDispatcher.h:
* UIProcess/Cocoa/WKSafeBrowsingWarning.h:
* UIProcess/PageClient.h:
* UIProcess/ProcessThrottler.h:
* UIProcess/WebAuthentication/WebAuthenticationRequestData.h:
* WebProcess/GPU/graphics/ImageBufferBackendHandle.h:
* WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:

Source/WebKitLegacy/mac:

* DOM/DOMHTMLOptionsCollection.mm:

Source/WTF:

* WTF.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:
* wtf/LikelyDenseUnsignedIntegerSet.h:
* wtf/StdLibExtras.h:
(WTF::switchOn):
* wtf/Variant.h: Removed.
* wtf/text/TextBreakIterator.h:

Canonical link: https://commits.webkit.org/243023@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284213 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Alex Christensen authored and webkit-commit-queue committed Oct 14, 2021
1 parent 13f5d9c commit 657f6fe53e07c0b411b6b26e5ebeeee9885a851c
Showing 153 changed files with 338 additions and 212 deletions.
@@ -1,3 +1,21 @@
2021-10-14 Alex Christensen <achristensen@webkit.org>

Remove Variant.h
https://bugs.webkit.org/show_bug.cgi?id=231744

Reviewed by Darin Adler.

* jit/AssemblyHelpers.h:
* jit/SnippetReg.h:
* parser/Lexer.cpp:
* parser/VariableEnvironment.h:
* runtime/BytecodeCacheError.h:
* runtime/CachePayload.h:
* runtime/CacheUpdate.h:
* runtime/TemporalObject.h:
* runtime/TemporalTimeZone.h:
* wasm/WasmLLIntGenerator.cpp:

2021-10-14 Tadeu Zagallo <tzagallo@apple.com>

Wasm LLInt should zero bytecodeIndex before throwing
@@ -44,7 +44,7 @@
#include "TagRegistersMode.h"
#include "TypeofType.h"
#include "VM.h"
#include <wtf/Variant.h>
#include <variant>

namespace JSC {

@@ -27,7 +27,7 @@
#pragma once

#include "Reg.h"
#include <wtf/Variant.h>
#include <variant>

#if ENABLE(JIT)

@@ -32,9 +32,9 @@
#include "ParseInt.h"
#include <limits.h>
#include <string.h>
#include <variant>
#include <wtf/Assertions.h>
#include <wtf/HexNumber.h>
#include <wtf/Variant.h>
#include <wtf/dtoa.h>

namespace JSC {
@@ -26,10 +26,10 @@
#pragma once

#include "Identifier.h"
#include <variant>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/IteratorRange.h>
#include <wtf/Variant.h>

namespace JSC {

@@ -28,7 +28,7 @@
#include "JSGlobalObject.h"
#include "JSSourceCode.h"
#include "ParserError.h"
#include <wtf/Variant.h>
#include <variant>
#include <wtf/text/WTFString.h>

namespace JSC {
@@ -26,9 +26,9 @@
#pragma once

#include "VM.h"
#include <variant>
#include <wtf/FileSystem.h>
#include <wtf/MallocPtr.h>
#include <wtf/Variant.h>

namespace JSC {

@@ -28,7 +28,7 @@
#include "CachePayload.h"
#include "CachedTypes.h"
#include "CodeSpecializationKind.h"
#include <wtf/Variant.h>
#include <variant>

namespace JSC {

@@ -21,7 +21,7 @@
#pragma once

#include "JSObject.h"
#include <wtf/Variant.h>
#include <variant>

namespace JSC {

@@ -28,7 +28,7 @@
#include "ISO8601.h"
#include "IntlObject.h"
#include "JSObject.h"
#include <wtf/Variant.h>
#include <variant>

namespace JSC {

@@ -38,9 +38,9 @@
#include "WasmFunctionCodeBlock.h"
#include "WasmFunctionParser.h"
#include "WasmGeneratorTraits.h"
#include <variant>
#include <wtf/CompletionHandler.h>
#include <wtf/RefPtr.h>
#include <wtf/Variant.h>

namespace JSC { namespace Wasm {

@@ -1,3 +1,18 @@
2021-10-14 Alex Christensen <achristensen@webkit.org>

Remove Variant.h
https://bugs.webkit.org/show_bug.cgi?id=231744

Reviewed by Darin Adler.

* WTF.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:
* wtf/LikelyDenseUnsignedIntegerSet.h:
* wtf/StdLibExtras.h:
(WTF::switchOn):
* wtf/Variant.h: Removed.
* wtf/text/TextBreakIterator.h:

2021-10-14 Alex Christensen <achristensen@webkit.org>

Share IPC communication code between webpushd and adattributiond
@@ -492,7 +492,6 @@
7C98CDC823E7AFC80012F232 /* PlatformEnableWinApple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformEnableWinApple.h; sourceTree = "<group>"; };
7C98CDC923E7AFC80012F232 /* PlatformEnableWinCairo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformEnableWinCairo.h; sourceTree = "<group>"; };
7CBBA07319BB7FDC00BBF025 /* OSObjectPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSObjectPtr.h; sourceTree = "<group>"; };
7CD0D5A71D55322A000CC9E1 /* Variant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Variant.h; sourceTree = "<group>"; };
7CD4C26F1E2C82B900929470 /* StringConcatenateNumbers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringConcatenateNumbers.h; sourceTree = "<group>"; };
7CDD7FF7186D291E007433CD /* IteratorAdaptors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorAdaptors.h; sourceTree = "<group>"; };
7CDD7FF9186D2A54007433CD /* IteratorRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorRange.h; sourceTree = "<group>"; };
@@ -1377,7 +1376,6 @@
7AFEC6B01EB22B5900DADE36 /* UUID.cpp */,
7AFEC6AE1EB22AC600DADE36 /* UUID.h */,
A8A4736F151A825B004123FF /* ValueCheck.h */,
7CD0D5A71D55322A000CC9E1 /* Variant.h */,
0F95B63420CB53C100479635 /* Vector.cpp */,
A8A47370151A825B004123FF /* Vector.h */,
E419F2E623AB9E2300B26129 /* VectorHash.h */,
@@ -306,7 +306,6 @@ set(WTF_PUBLIC_HEADERS
UnsafePointer.h
VMTags.h
ValueCheck.h
Variant.h
Vector.h
VectorHash.h
VectorTraits.h
@@ -25,13 +25,13 @@

#pragma once

#include <variant>
#include <wtf/Assertions.h>
#include <wtf/BitVector.h>
#include <wtf/FastMalloc.h>
#include <wtf/HashFunctions.h>
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
#include <wtf/Variant.h>

namespace WTF {

@@ -29,6 +29,7 @@
#include <cstring>
#include <memory>
#include <type_traits>
#include <variant>
#include <wtf/Assertions.h>
#include <wtf/CheckedArithmetic.h>
#include <wtf/Compiler.h>
@@ -385,6 +386,12 @@ Visitor<F...> makeVisitor(F... f)
return Visitor<F...>(f...);
}

template<class V, class... F>
auto switchOn(V&& v, F&&... f) -> decltype(std::visit(makeVisitor(std::forward<F>(f)...), std::forward<V>(v)))
{
return std::visit(makeVisitor(std::forward<F>(f)...), std::forward<V>(v));
}

namespace Detail
{
template <typename, template <typename...> class>

This file was deleted.

@@ -22,8 +22,8 @@
#pragma once

#include <mutex>
#include <variant>
#include <wtf/NeverDestroyed.h>
#include <wtf/Variant.h>
#include <wtf/text/StringView.h>
#include <wtf/text/icu/TextBreakIteratorICU.h>

@@ -1,3 +1,119 @@
2021-10-14 Alex Christensen <achristensen@webkit.org>

Remove Variant.h
https://bugs.webkit.org/show_bug.cgi?id=231744

Reviewed by Darin Adler.

* Modules/async-clipboard/ClipboardItemBindingsDataSource.h:
* Modules/fetch/FetchBody.h:
* Modules/fetch/FetchHeaders.h:
* Modules/indexeddb/IDBCursor.h:
* Modules/indexeddb/IDBGetAllResult.h:
* Modules/indexeddb/IDBKey.h:
* Modules/indexeddb/IDBKeyData.h:
* Modules/indexeddb/IDBKeyPath.h:
* Modules/indexeddb/IDBRequest.cpp:
* Modules/mediacontrols/MediaControlsHost.cpp:
* Modules/mediacontrols/MediaControlsHost.h:
* Modules/mediastream/MediaTrackConstraints.h:
* Modules/mediastream/RTCIceServer.h:
* Modules/paymentrequest/PaymentMethodChangeEvent.h:
* Modules/paymentrequest/PaymentRequest.h:
* Modules/push-api/PushEventInit.h:
* Modules/push-api/PushSubscription.h:
* Modules/push-api/PushSubscriptionOptionsInit.h:
* Modules/speech/SpeechRecognitionUpdate.h:
* Modules/webaudio/AudioContextOptions.h:
* Modules/webaudio/AudioNode.h:
* Modules/webxr/WebXRWebGLLayer.h:
* accessibility/AccessibilityObjectInterface.h:
* accessibility/isolatedtree/AXIsolatedObject.h:
* accessibility/mac/WebAccessibilityObjectWrapperBase.h:
* animation/AnimationEffect.h:
* animation/EffectTiming.h:
* animation/OptionalEffectTiming.h:
* bindings/IDLTypes.h:
* bindings/js/BufferSource.h:
* bindings/js/JSDOMConvertUnion.h:
* bindings/js/JSValueInWrappedObject.h:
* bindings/scripts/CodeGeneratorJS.pm:
(AddToIncludesForIDLType):
* crypto/CryptoAlgorithm.h:
* crypto/CryptoKey.h:
* crypto/SubtleCrypto.h:
* crypto/algorithms/CryptoAlgorithmAES_KW.cpp:
* crypto/algorithms/CryptoAlgorithmHMAC.cpp:
* crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp:
* crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp:
* crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp:
* crypto/algorithms/CryptoAlgorithmRSA_PSS.cpp:
* crypto/parameters/CryptoAlgorithmEcdsaParams.h:
* crypto/parameters/CryptoAlgorithmHmacKeyParams.h:
* crypto/parameters/CryptoAlgorithmRsaHashedImportParams.h:
* crypto/parameters/CryptoAlgorithmRsaHashedKeyGenParams.h:
* css/CSSCustomPropertyValue.h:
* css/CSSFontFaceSet.h:
* css/CSSStyleDeclaration.cpp:
* css/DOMMatrixReadOnly.h:
* css/FontFace.h:
* css/StyleRule.h:
* css/parser/CSSPropertyParserHelpers.h:
* css/typedom/CSSNumericValue.h:
* css/typedom/CSSUnparsedValue.cpp:
* css/typedom/CSSUnparsedValue.h:
* dom/ContainerNode.cpp:
* dom/DocumentMarker.h:
* dom/EventTarget.h:
* dom/MessageEvent.h:
* dom/Node.cpp:
* editing/AlternativeTextController.h:
* fileapi/Blob.h:
* fileapi/NetworkSendQueue.h:
* html/DOMFormData.h:
* html/HTMLAllCollection.cpp:
* html/ImageBitmap.cpp:
* html/URLSearchParams.h:
* html/canvas/CanvasStyle.h:
* inspector/InspectorCanvas.cpp:
* inspector/InspectorCanvas.h:
* inspector/InspectorCanvasCallTracer.cpp:
* inspector/InspectorShaderProgram.cpp:
* inspector/InspectorShaderProgram.h:
<