Attachment 426693 Details for Bug 222652 – Patch

[patch] Patch

bug-222652-20210421183425.patch (text/plain), 33.80 KB, created by Adrian Perez on 2021-04-21 08:34:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2021-04-21 08:34:26 PDT

Size: 33.80 KB

patch

obsolete

>Subversion Revision: 276361
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index bcaf422f414e9bb334c83fc851372371ba705b85..e22b71117a2caa366baa5d462cee03ecd5d7c0a6 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,33 @@
>+2021-04-21  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        Non-unified build fixes, mid April 2021 edition
>+        https://bugs.webkit.org/show_bug.cgi?id=222652
>+        <rdar://problem/75262285>
>+
>+        Unreviewed non-unified build fixes.
>+
>+        * bytecode/JumpTable.cpp: Remove inclusion of wtf/text/StringHash.h
>+        * bytecode/JumpTable.h: Add missing inclusions of wtf/FixedVector.h and
>+        wtf/text/StringHash.h
>+        * bytecode/SpeculatedType.cpp: Add missing includes JSCJSValueInlines.h and
>+        JSCellInlines.h
>+        * bytecompiler/BytecodeGenerator.cpp: Move template method to header, remove now uneeded
>+        LinkTimeConstant.h include.
>+        * bytecompiler/BytecodeGenerator.h: Add include for LinkTimeConstant.h
>+        (JSC::BytecodeGenerator::emitDirectSetPrototypeOf): Template method moved here from
>+        BytecodeGenerator.cpp to avoid compile errors due to usage of missing template body
>+        definition.
>+        * dfg/DFGDesiredGlobalProperties.cpp: Add missing DFGDesiredWatchpoints.h include.
>+        * ftl/FTLAbstractHeap.cpp: Add missing JSCJSValueInlines.h include.
>+        * runtime/JSCustomGetterFunction.cpp: Add missing IdentifierInlines.h include.
>+        * runtime/JSCustomSetterFunction.cpp: Ditto.
>+        * runtime/SetPrototype.cpp: Add missing HashMapImplInlines.h include.
>+        * runtime/VMTraps.cpp: Add missing VMEntryScope.h include.
>+        * runtime/WeakSetConstructor.cpp: Add missing WeakMapImplInlines.h include.
>+        * runtime/WeakSetPrototype.cpp: Add missing includes for HashMapImplInlines.h and
>+        WeakMapImplInlines.h
>+        * wasm/js/JSWebAssemblyTable.cpp: Add missing ObjectConstructor.h include.
>+
> 2021-04-20  Michael Catanzaro  <mcatanzaro@gnome.org>
> 
>         Static asserts in WasmAirIRGenerator.cpp and WasmB3IRGenerator.cpp trigger -Wnonnull warnings with GCC 11
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d6e0252331cdf4cb8723fc0a6af1f945a41b247f..f911c5a1be5a61924056df52be4ec61ca4b3d828 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,47 @@
>+2021-04-21  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        Non-unified build fixes, mid April 2021 edition
>+        https://bugs.webkit.org/show_bug.cgi?id=222652
>+        <rdar://problem/75262285>
>+
>+        Unreviewed non-unified build fixes.
>+
>+        No new tests needed.
>+
>+        * bindings/js/JSWebXRRigidTransformCustom.cpp: Add missing JSDOMConvertBufferSource.h
>+        include.
>+        * bindings/js/JSWebXRSpaceCustom.cpp: Add missing JSWebXRReferenceSpace.h include.
>+        * bindings/js/JSWebXRViewCustom.cpp: Add missing JSDOMConvertBufferSource.h include.
>+        * bindings/js/WorkerModuleScriptLoader.cpp: Add missing ServiceWorkerGlobalScope.h
>+        include.
>+        * css/CSSFontFaceSrcValue.cpp: Add missing CachedFontLoadRequest.h include.
>+        * css/parser/CSSPropertyParserWorkerSafe.cpp: Add missing includes for
>+        CSSFontFaceSrcValue.h, CSSFontFeatureValue.h, CSSUnicodeRangeValue.h, Document.h, and
>+        StyleSheetContents.h; remove (now unneeded) CSSPropertyParserHelpers.h include.
>+        (WebCore::CSSPropertyParserWorkerSafe::parseFont): Sprinkle usage of functions with
>+        missing WebCore:: namespace prefixes.
>+        (WebCore::CSSPropertyParserHelpersWorkerSafe::consumeFontFaceSrcLocal): Ditto.
>+        (WebCore::CSSPropertyParserHelpersWorkerSafe::consumeFontStyleRange): Ditto.
>+        * css/parser/CSSPropertyParserWorkerSafe.h: Add missing CSSPropertyParserHelpers.h
>+        include.
>+        * dom/DocumentFontLoader.cpp: Add missing includes CSSFontSelector.h,
>+        CachedResourceLoader.h, Frame.h, and FrameLoader.h
>+        * editing/AppendNodeCommand.cpp: Add missing CompositeEditCommand.h include.
>+        * editing/DeleteFromTextNodeCommand.cpp: Ditto.
>+        * editing/InsertIntoTextNodeCommand.cpp: Ditto.
>+        * editing/InsertNodeBeforeCommand.cpp: Ditto.
>+        * editing/MergeIdenticalElementsCommand.h: Ditto, and remove unneeded EditCommand.h
>+        include.
>+        * editing/RemoveNodeCommand.cpp: Add missing CompositeEditCommand.h include.
>+        * editing/SetNodeAttributeCommand.cpp: Ditto.
>+        * editing/SetSelectionCommand.cpp: Ditto.
>+        * editing/SplitElementCommand.cpp: Ditto.
>+        * editing/SplitTextNodeCommand.cpp: Ditto.
>+        * loader/cache/CachedFontLoadRequest.h: Add missing FontSelectionAlgorithm.h include.
>+        * platform/graphics/FontTaggedSettings.h: Add missing wtf/Hasher.h include.
>+        * platform/text/BidiContext.cpp: Add missing <mutex> and wtf/NeverDestroyed.h includes.
>+        * workers/WorkerGlobalScopeProxy.h: Forward-declare WebCore::ScriptBuffer.
>+
> 2021-04-21  Michael Catanzaro  <mcatanzaro@gnome.org>
> 
>         URL::URL(HashTableDeletedValueType) triggers -Wuninitialized warnings with GCC 11
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 0ac8ba3ec5c48bf4343e0b92395a24626a86b6de..cb1fc5e8201c9e902803b986efb4477f4528771a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2021-04-21  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        Non-unified build fixes, mid April 2021 edition
>+        https://bugs.webkit.org/show_bug.cgi?id=222652
>+        <rdar://problem/75262285>
>+
>+        Unreviewed non-unified build fixes.
>+
>+        * WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp: Add missing
>+        NetworkProcessConnection.h include.
>+        (WebKit::RTCDataChannelRemoteManager::connectToRemoteSource): Sprinkle missing WebCore::
>+        namespace prefixes.
>+        (WebKit::RTCDataChannelRemoteManager::postTaskToHandler): Ditto.
>+        (WebKit::RTCDataChannelRemoteManager::sourceFromIdentifier): Ditto.
>+        * WebProcess/WebPage/WebURLSchemeTaskProxy.cpp: Add missing WebProcess.h include.
>+
> 2021-04-21  Simon Fraser  <simon.fraser@apple.com>
> 
>         Enhance scrolling-related trace points
>diff --git a/Source/JavaScriptCore/bytecode/JumpTable.cpp b/Source/JavaScriptCore/bytecode/JumpTable.cpp
>index 44952d91f971716859f22f249e50492165830e14..fe3c8248573be3333a533ab2e84ef5e71e67ec21 100644
>--- a/Source/JavaScriptCore/bytecode/JumpTable.cpp
>+++ b/Source/JavaScriptCore/bytecode/JumpTable.cpp
>@@ -30,8 +30,6 @@
> #include "config.h"
> #include "JumpTable.h"
> 
>-#include <wtf/text/StringHash.h>
>-
> namespace JSC {
> 
> } // namespace JSC
>diff --git a/Source/JavaScriptCore/bytecode/JumpTable.h b/Source/JavaScriptCore/bytecode/JumpTable.h
>index 5d8e9687558982813b566349eda81f7af3bf9df3..e2c3eea30c2a7c3fac6663c22b3edd9048cf5e12 100644
>--- a/Source/JavaScriptCore/bytecode/JumpTable.h
>+++ b/Source/JavaScriptCore/bytecode/JumpTable.h
>@@ -31,8 +31,10 @@
> 
> #include "CodeLocation.h"
> #include "UnlinkedCodeBlock.h"
>+#include <wtf/FixedVector.h>
> #include <wtf/RobinHoodHashMap.h>
> #include <wtf/Vector.h>
>+#include <wtf/text/StringHash.h>
> #include <wtf/text/StringImpl.h>
> 
> namespace JSC {
>diff --git a/Source/JavaScriptCore/bytecode/SpeculatedType.cpp b/Source/JavaScriptCore/bytecode/SpeculatedType.cpp
>index be9ac66ee3a7a08aa356608c55481a67eeddeee8..59fa656c75f16e61b3e1dece34541cb6bf30329c 100644
>--- a/Source/JavaScriptCore/bytecode/SpeculatedType.cpp
>+++ b/Source/JavaScriptCore/bytecode/SpeculatedType.cpp
>@@ -34,6 +34,8 @@
> #include "JSArray.h"
> #include "JSBigInt.h"
> #include "JSBoundFunction.h"
>+#include "JSCJSValueInlines.h"
>+#include "JSCellInlines.h"
> #include "JSDataView.h"
> #include "JSFunction.h"
> #include "JSMap.h"
>diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>index a2bc675e03f37e2608bb1c79889c719a36606d5b..426093f117680b517d7cb864117c3460004fb334 100644
>--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>@@ -45,7 +45,6 @@
> #include "JSCInlines.h"
> #include "JSImmutableButterfly.h"
> #include "JSTemplateObjectDescriptor.h"
>-#include "LinkTimeConstant.h"
> #include "Options.h"
> #include "PrivateFieldPutKind.h"
> #include "StrongInlines.h"
>@@ -2706,19 +2705,6 @@ RegisterID* BytecodeGenerator::emitGetPrototypeOf(RegisterID* dst, RegisterID* v
>     return dst;
> }
> 
>-template<InvalidPrototypeMode mode>
>-RegisterID* BytecodeGenerator::emitDirectSetPrototypeOf(RegisterID* base, RegisterID* prototype, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd)
>-{
>-    RefPtr<RegisterID> setPrototypeDirect = moveLinkTimeConstant(nullptr, mode == InvalidPrototypeMode::Throw ? LinkTimeConstant::setPrototypeDirectOrThrow : LinkTimeConstant::setPrototypeDirect);
>-
>-    CallArguments args(*this, nullptr, 1);
>-    move(args.thisRegister(), base);
>-    move(args.argumentRegister(0), prototype);
>-
>-    emitCall(newTemporary(), setPrototypeDirect.get(), NoExpectedFunction, args, divot, divotStart, divotEnd, DebuggableCall::No);
>-    return base;
>-}
>-
> RegisterID* BytecodeGenerator::emitPutByVal(RegisterID* base, RegisterID* property, RegisterID* value)
> {
>     OpPutByVal::emit(this, base, property, value, ecmaMode());
>diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>index 201100bd1e9926aa3c7d4ca66c489ebf8a81d075..e511dc27555de5b88447e333f9e16625a856261c 100644
>--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>@@ -41,6 +41,7 @@
> #include "JSTemplateObjectDescriptor.h"
> #include "Label.h"
> #include "LabelScope.h"
>+#include "LinkTimeConstant.h"
> #include "Nodes.h"
> #include "ParserError.h"
> #include "ProfileTypeBytecodeFlag.h"
>@@ -816,8 +817,19 @@ namespace JSC {
>         RegisterID* emitGetByVal(RegisterID* dst, RegisterID* base, RegisterID* thisValue, RegisterID* property);
>         RegisterID* emitGetPrototypeOf(RegisterID* dst, RegisterID* value);
> 
>-        template<InvalidPrototypeMode>
>-        RegisterID* emitDirectSetPrototypeOf(RegisterID* base, RegisterID* prototype, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd);
>+        template<InvalidPrototypeMode mode>
>+        RegisterID* emitDirectSetPrototypeOf(RegisterID* base, RegisterID* prototype, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd)
>+        {
>+            RefPtr<RegisterID> setPrototypeDirect = moveLinkTimeConstant(nullptr, mode == InvalidPrototypeMode::Throw ? LinkTimeConstant::setPrototypeDirectOrThrow : LinkTimeConstant::setPrototypeDirect);
>+
>+            CallArguments args(*this, nullptr, 1);
>+            move(args.thisRegister(), base);
>+            move(args.argumentRegister(0), prototype);
>+
>+            emitCall(newTemporary(), setPrototypeDirect.get(), NoExpectedFunction, args, divot, divotStart, divotEnd, DebuggableCall::No);
>+            return base;
>+        }
>+
>         RegisterID* emitPutByVal(RegisterID* base, RegisterID* property, RegisterID* value);
>         RegisterID* emitPutByVal(RegisterID* base, RegisterID* thisValue, RegisterID* property, RegisterID* value);
>         RegisterID* emitDirectPutByVal(RegisterID* base, RegisterID* property, RegisterID* value);
>diff --git a/Source/JavaScriptCore/dfg/DFGDesiredGlobalProperties.cpp b/Source/JavaScriptCore/dfg/DFGDesiredGlobalProperties.cpp
>index 5d0bb595dd9d4d22fa0c51d6bf4e322067e8eadc..d91f9107964656bfb5470fe4d775b20445900a56 100644
>--- a/Source/JavaScriptCore/dfg/DFGDesiredGlobalProperties.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGDesiredGlobalProperties.cpp
>@@ -31,6 +31,7 @@
> #include "CodeBlock.h"
> #include "DFGCommonData.h"
> #include "DFGDesiredIdentifiers.h"
>+#include "DFGDesiredWatchpoints.h"
> #include "JSGlobalObject.h"
> 
> namespace JSC { namespace DFG {
>diff --git a/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp b/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp
>index 4f6018617d8cf23ebef21fc041555f63b8d73d4e..153371ef792292cfce5333983e597afdc5c8fde9 100644
>--- a/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp
>+++ b/Source/JavaScriptCore/ftl/FTLAbstractHeap.cpp
>@@ -31,6 +31,7 @@
> #include "FTLAbbreviatedTypes.h"
> #include "FTLOutput.h"
> #include "FTLTypedPointer.h"
>+#include "JSCJSValueInlines.h"
> #include "Options.h"
> 
> namespace JSC { namespace FTL {
>diff --git a/Source/JavaScriptCore/runtime/JSCustomGetterFunction.cpp b/Source/JavaScriptCore/runtime/JSCustomGetterFunction.cpp
>index 8b159840c15c48bad2bddb58c75e22246508b0e2..da2abc3df1b371cf73621a3dabb246b5ece0f33d 100644
>--- a/Source/JavaScriptCore/runtime/JSCustomGetterFunction.cpp
>+++ b/Source/JavaScriptCore/runtime/JSCustomGetterFunction.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "JSCustomGetterFunction.h"
> 
>+#include "IdentifierInlines.h"
> #include "JSCJSValueInlines.h"
> 
> namespace JSC {
>diff --git a/Source/JavaScriptCore/runtime/JSCustomSetterFunction.cpp b/Source/JavaScriptCore/runtime/JSCustomSetterFunction.cpp
>index f2fab7efbf209b64200576a993deffd8b978131f..ec544c78487fd5435a00da6f3fadfe001e35c235 100644
>--- a/Source/JavaScriptCore/runtime/JSCustomSetterFunction.cpp
>+++ b/Source/JavaScriptCore/runtime/JSCustomSetterFunction.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "JSCustomSetterFunction.h"
> 
>+#include "IdentifierInlines.h"
> #include "JSCJSValueInlines.h"
> 
> namespace JSC {
>diff --git a/Source/JavaScriptCore/runtime/SetPrototype.cpp b/Source/JavaScriptCore/runtime/SetPrototype.cpp
>index 33a0491c654576b5315374f6c4e0dbf78b77d076..a6efc2fbb31446e82a4634212f27b6d0d4d592ce 100644
>--- a/Source/JavaScriptCore/runtime/SetPrototype.cpp
>+++ b/Source/JavaScriptCore/runtime/SetPrototype.cpp
>@@ -27,6 +27,7 @@
> #include "SetPrototype.h"
> 
> #include "BuiltinNames.h"
>+#include "HashMapImplInlines.h"
> #include "JSCInlines.h"
> #include "JSSet.h"
> #include "JSSetIterator.h"
>diff --git a/Source/JavaScriptCore/runtime/VMTraps.cpp b/Source/JavaScriptCore/runtime/VMTraps.cpp
>index 912ccb71efe599cefcc8e9e683248b0cad16c90a..9586eab16b4fdfde6e03cbfbd9756c8c933a29cb 100644
>--- a/Source/JavaScriptCore/runtime/VMTraps.cpp
>+++ b/Source/JavaScriptCore/runtime/VMTraps.cpp
>@@ -36,6 +36,7 @@
> #include "LLIntPCRanges.h"
> #include "MachineContext.h"
> #include "MacroAssemblerCodeRef.h"
>+#include "VMEntryScope.h"
> #include "VMTrapsInlines.h"
> #include "Watchdog.h"
> #include <wtf/ProcessID.h>
>diff --git a/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp b/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp
>index 94612496873cb82698bfd563a597c240ab698945..c8daab46b03db03e0e7aaaf710f91348415f6ab0 100644
>--- a/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp
>+++ b/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp
>@@ -29,6 +29,7 @@
> #include "IteratorOperations.h"
> #include "JSCInlines.h"
> #include "JSWeakSet.h"
>+#include "WeakMapImplInlines.h"
> #include "WeakSetPrototype.h"
> 
> namespace JSC {
>diff --git a/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp b/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp
>index 0a6b77f879ea7366a5eaf336207987d3388684dd..c17ffcf07b681ec8aadfc8a19ff37500008ce0d7 100644
>--- a/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp
>+++ b/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp
>@@ -26,8 +26,10 @@
> #include "config.h"
> #include "WeakSetPrototype.h"
> 
>+#include "HashMapImplInlines.h"
> #include "JSCInlines.h"
> #include "JSWeakSet.h"
>+#include "WeakMapImplInlines.h"
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/wasm/js/JSWebAssemblyTable.cpp b/Source/JavaScriptCore/wasm/js/JSWebAssemblyTable.cpp
>index 7a863de264e5684c8b22bf717ad4675b2db57e5c..7ef73483b28a08f21a6c8a5847ec63d900d283cc 100644
>--- a/Source/JavaScriptCore/wasm/js/JSWebAssemblyTable.cpp
>+++ b/Source/JavaScriptCore/wasm/js/JSWebAssemblyTable.cpp
>@@ -30,6 +30,7 @@
> 
> #include "JSCInlines.h"
> #include "JSWebAssemblyInstance.h"
>+#include "ObjectConstructor.h"
> 
> namespace JSC {
> 
>diff --git a/Source/WebCore/bindings/js/JSWebXRRigidTransformCustom.cpp b/Source/WebCore/bindings/js/JSWebXRRigidTransformCustom.cpp
>index 0143a99969cf876304fd6e73bff80781f35b09db..09378d640e89672db85bd0335482bb7b715b1414 100644
>--- a/Source/WebCore/bindings/js/JSWebXRRigidTransformCustom.cpp
>+++ b/Source/WebCore/bindings/js/JSWebXRRigidTransformCustom.cpp
>@@ -28,6 +28,7 @@
> #if ENABLE(WEBXR)
> #include "JSWebXRRigidTransform.h"
> 
>+#include "JSDOMConvertBufferSource.h"
> #include "WebXRRigidTransform.h"
> 
> namespace WebCore {
>diff --git a/Source/WebCore/bindings/js/JSWebXRSpaceCustom.cpp b/Source/WebCore/bindings/js/JSWebXRSpaceCustom.cpp
>index d4fe2134bcecf0031bf3fbaf921de01a8bc53766..4adae98bd9483dd7c1dc909cd0417b06d3eb56fc 100644
>--- a/Source/WebCore/bindings/js/JSWebXRSpaceCustom.cpp
>+++ b/Source/WebCore/bindings/js/JSWebXRSpaceCustom.cpp
>@@ -28,6 +28,7 @@
> #if ENABLE(WEBXR)
> #include "JSWebXRSpace.h"
> 
>+#include "JSWebXRReferenceSpace.h"
> #include "WebXRReferenceSpace.h"
> 
> namespace WebCore {
>diff --git a/Source/WebCore/bindings/js/JSWebXRViewCustom.cpp b/Source/WebCore/bindings/js/JSWebXRViewCustom.cpp
>index 1af4f8d6433991cdfea201ed10c9b78a5dbdcc00..9d9da0e6e8d6939005d9d25b23de9d721f144891 100644
>--- a/Source/WebCore/bindings/js/JSWebXRViewCustom.cpp
>+++ b/Source/WebCore/bindings/js/JSWebXRViewCustom.cpp
>@@ -28,6 +28,7 @@
> #if ENABLE(WEBXR)
> #include "JSWebXRView.h"
> 
>+#include "JSDOMConvertBufferSource.h"
> #include "WebXRView.h"
> 
> namespace WebCore {
>diff --git a/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp b/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp
>index 82e23697108fed22209c852763d6e04ec0915e2e..2ae5b7bf28256074c37fb88a3b32845383dc59e7 100644
>--- a/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp
>+++ b/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp
>@@ -36,6 +36,7 @@
> #include "ScriptController.h"
> #include "ScriptModuleLoader.h"
> #include "ScriptSourceCode.h"
>+#include "ServiceWorkerGlobalScope.h"
> #include "WorkerScriptFetcher.h"
> #include "WorkerScriptLoader.h"
> 
>diff --git a/Source/WebCore/css/CSSFontFaceSrcValue.cpp b/Source/WebCore/css/CSSFontFaceSrcValue.cpp
>index 239ee40041dd17d8a708b8b26f8130ede7537c2b..529a3e14920bccc467f9a7849e6d2294dbf36d02 100644
>--- a/Source/WebCore/css/CSSFontFaceSrcValue.cpp
>+++ b/Source/WebCore/css/CSSFontFaceSrcValue.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "CSSFontFaceSrcValue.h"
> #include "CachedFont.h"
>+#include "CachedFontLoadRequest.h"
> #include "CachedResourceLoader.h"
> #include "CachedResourceRequest.h"
> #include "CachedResourceRequestInitiators.h"
>diff --git a/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.cpp b/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.cpp
>index fa1ef4d726bc9c374e8307e959ce21dabc534ceb..5626f82716e559e132ba97e0cd351c94c84a6197 100644
>--- a/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.cpp
>+++ b/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.cpp
>@@ -32,14 +32,18 @@
> #include "config.h"
> #include "CSSPropertyParserWorkerSafe.h"
> 
>+#include "CSSFontFaceSrcValue.h"
>+#include "CSSFontFeatureValue.h"
> #include "CSSFontStyleValue.h"
> #include "CSSParserFastPaths.h"
> #include "CSSParserImpl.h"
> #include "CSSParserTokenRange.h"
> #include "CSSPropertyParser.h"
>-#include "CSSPropertyParserHelpers.h"
> #include "CSSTokenizer.h"
>+#include "CSSUnicodeRangeValue.h"
>+#include "Document.h"
> #include "ScriptExecutionContext.h"
>+#include "StyleSheetContents.h"
> 
> #if ENABLE(VARIATION_FONTS)
> #include "CSSFontStyleRangeValue.h"
>@@ -47,7 +51,7 @@
> 
> namespace WebCore {
> 
>-Optional<FontRaw> CSSPropertyParserWorkerSafe::parseFont(const String& string, CSSParserMode mode)
>+Optional<CSSPropertyParserHelpers::FontRaw> CSSPropertyParserWorkerSafe::parseFont(const String& string, CSSParserMode mode)
> {
>     CSSTokenizer tokenizer(string);
>     CSSParserTokenRange range(tokenizer.tokenRange());
>@@ -228,7 +232,7 @@ static RefPtr<CSSValue> consumeFontFaceSrcLocal(CSSParserTokenRange& range)
>         return CSSFontFaceSrcValue::createLocal(arg.value().toString());
>     }
>     if (args.peek().type() == IdentToken) {
>-        String familyName = concatenateFamilyName(args);
>+        String familyName = CSSPropertyParserHelpers::concatenateFamilyName(args);
>         if (!args.atEnd())
>             return nullptr;
>         return CSSFontFaceSrcValue::createLocal(familyName);
>@@ -284,9 +288,9 @@ RefPtr<CSSFontStyleRangeValue> consumeFontStyleRange(CSSParserTokenRange& range,
>         return CSSFontStyleRangeValue::create(keyword.releaseNonNull());
> 
>     // FIXME: This should probably not allow the unitless zero.
>-    if (auto firstAngle = CSSPropertyParserHelpers::consumeAngleWorkerSafe(range, cssParserMode, pool, UnitlessQuirk::Forbid, UnitlessZeroQuirk::Allow)) {
>+    if (auto firstAngle = CSSPropertyParserHelpers::consumeAngleWorkerSafe(range, cssParserMode, pool, CSSPropertyParserHelpers::UnitlessQuirk::Forbid, CSSPropertyParserHelpers::UnitlessZeroQuirk::Allow)) {
>         auto firstAngleInDegrees = firstAngle->doubleValue(CSSUnitType::CSS_DEG);
>-        if (!isFontStyleAngleInRange(firstAngleInDegrees))
>+        if (!CSSPropertyParserHelpers::isFontStyleAngleInRange(firstAngleInDegrees))
>             return nullptr;
>         if (range.atEnd()) {
>             auto result = CSSValueList::createSpaceSeparated();
>@@ -295,11 +299,11 @@ RefPtr<CSSFontStyleRangeValue> consumeFontStyleRange(CSSParserTokenRange& range,
>         }
> 
>         // FIXME: This should probably not allow the unitless zero.
>-        auto secondAngle = CSSPropertyParserHelpers::consumeAngleWorkerSafe(range, cssParserMode, pool, UnitlessQuirk::Forbid, UnitlessZeroQuirk::Allow);
>+        auto secondAngle = CSSPropertyParserHelpers::consumeAngleWorkerSafe(range, cssParserMode, pool, CSSPropertyParserHelpers::UnitlessQuirk::Forbid, CSSPropertyParserHelpers::UnitlessZeroQuirk::Allow);
>         if (!secondAngle)
>             return nullptr;
>         auto secondAngleInDegrees = secondAngle->doubleValue(CSSUnitType::CSS_DEG);
>-        if (!isFontStyleAngleInRange(secondAngleInDegrees) || firstAngleInDegrees > secondAngleInDegrees)
>+        if (!CSSPropertyParserHelpers::isFontStyleAngleInRange(secondAngleInDegrees) || firstAngleInDegrees > secondAngleInDegrees)
>             return nullptr;
>         auto result = CSSValueList::createSpaceSeparated();
>         result->append(firstAngle.releaseNonNull());
>diff --git a/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.h b/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.h
>index 016fcd09c24034e42c47eeb4fad9c610f2f65b7a..5d1e2083b9381e86b00de83b4a421e3ca9309703 100644
>--- a/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.h
>+++ b/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include "CSSParserContext.h"
>+#include "CSSPropertyParserHelpers.h"
> #include <wtf/Optional.h>
> #include <wtf/RefPtr.h>
> #include <wtf/text/WTFString.h>
>diff --git a/Source/WebCore/dom/DocumentFontLoader.cpp b/Source/WebCore/dom/DocumentFontLoader.cpp
>index 7dd8de0687289dc8a6272e34451c542625c43b42..10fb230e168461aa27696f998423e61ba8c46400 100644
>--- a/Source/WebCore/dom/DocumentFontLoader.cpp
>+++ b/Source/WebCore/dom/DocumentFontLoader.cpp
>@@ -28,9 +28,13 @@
> #include "config.h"
> #include "DocumentFontLoader.h"
> 
>+#include "CSSFontSelector.h"
> #include "CachedFont.h"
>+#include "CachedResourceLoader.h"
> #include "CachedResourceRequest.h"
> #include "CachedResourceRequestInitiators.h"
>+#include "Frame.h"
>+#include "FrameLoader.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/editing/AppendNodeCommand.cpp b/Source/WebCore/editing/AppendNodeCommand.cpp
>index 2d598fcbb21ce2163c5bc287b9a07356b425a299..76e04cf019b900c901ef282956184b40dc28158a 100644
>--- a/Source/WebCore/editing/AppendNodeCommand.cpp
>+++ b/Source/WebCore/editing/AppendNodeCommand.cpp
>@@ -27,6 +27,7 @@
> #include "AppendNodeCommand.h"
> 
> #include "AXObjectCache.h"
>+#include "CompositeEditCommand.h"
> #include "Document.h"
> #include "Editing.h"
> #include "RenderElement.h"
>diff --git a/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp b/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp
>index def8afd98818cc3fb77f6e52fd7f8b42d9e83c75..7b3d9f21c6252055c002a8d33dd987762c7b0c16 100644
>--- a/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp
>+++ b/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp
>@@ -26,8 +26,9 @@
> #include "config.h"
> #include "DeleteFromTextNodeCommand.h"
> 
>-#include "Editing.h"
>+#include "CompositeEditCommand.h"
> #include "Document.h"
>+#include "Editing.h"
> #include "Text.h"
> 
> namespace WebCore {
>diff --git a/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp b/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp
>index df01826f393a02e9bc034324ef8cd38dbac3ffdc..8bbb7d72e1abc60360252a8a975bb88843a9cbcc 100644
>--- a/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp
>+++ b/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "InsertIntoTextNodeCommand.h"
> 
>+#include "CompositeEditCommand.h"
> #include "Document.h"
> #include "Editor.h"
> #include "EditorClient.h"
>diff --git a/Source/WebCore/editing/InsertNodeBeforeCommand.cpp b/Source/WebCore/editing/InsertNodeBeforeCommand.cpp
>index f0435e7477016b50f270fad348f01cbd43c4bc3a..da1df68bf75fe2e16f6098eb8e5f205ca30852a6 100644
>--- a/Source/WebCore/editing/InsertNodeBeforeCommand.cpp
>+++ b/Source/WebCore/editing/InsertNodeBeforeCommand.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "InsertNodeBeforeCommand.h"
> 
>+#include "CompositeEditCommand.h"
> #include "Document.h"
> #include "Editing.h"
> #include "RenderElement.h"
>diff --git a/Source/WebCore/editing/MergeIdenticalElementsCommand.h b/Source/WebCore/editing/MergeIdenticalElementsCommand.h
>index 97a7732c43f79f3f762f26dc5350f6e8ced9e17e..686aba6c826b77ecd935b6c4ca17b5a1331518ee 100644
>--- a/Source/WebCore/editing/MergeIdenticalElementsCommand.h
>+++ b/Source/WebCore/editing/MergeIdenticalElementsCommand.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#include "EditCommand.h"
>+#include "CompositeEditCommand.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/editing/RemoveNodeCommand.cpp b/Source/WebCore/editing/RemoveNodeCommand.cpp
>index e3657c4554b14773d664df75556a80365c82336d..09ae19653d2ef4412cf525b89ec15c259d3861c3 100644
>--- a/Source/WebCore/editing/RemoveNodeCommand.cpp
>+++ b/Source/WebCore/editing/RemoveNodeCommand.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "RemoveNodeCommand.h"
> 
>+#include "CompositeEditCommand.h"
> #include "Editing.h"
> #include "RenderElement.h"
> #include <wtf/Assertions.h>
>diff --git a/Source/WebCore/editing/SetNodeAttributeCommand.cpp b/Source/WebCore/editing/SetNodeAttributeCommand.cpp
>index 80c146a1840e8e4f894c86fbfb64a65f21b9b80e..1e2bbbcfbe56816fd3abef049a63c9f70c0fb0a4 100644
>--- a/Source/WebCore/editing/SetNodeAttributeCommand.cpp
>+++ b/Source/WebCore/editing/SetNodeAttributeCommand.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "SetNodeAttributeCommand.h"
> 
>+#include "CompositeEditCommand.h"
> #include "Element.h"
> #include <wtf/Assertions.h>
> 
>diff --git a/Source/WebCore/editing/SetSelectionCommand.cpp b/Source/WebCore/editing/SetSelectionCommand.cpp
>index 0dd26a81e90b67874c335cef12107e214bdfd86e..c81b5362834585c1564b08ed12fe311ff49d56c7 100644
>--- a/Source/WebCore/editing/SetSelectionCommand.cpp
>+++ b/Source/WebCore/editing/SetSelectionCommand.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "SetSelectionCommand.h"
> 
>+#include "CompositeEditCommand.h"
> #include "Document.h"
> #include "Frame.h"
> 
>diff --git a/Source/WebCore/editing/SplitElementCommand.cpp b/Source/WebCore/editing/SplitElementCommand.cpp
>index d21bcf09deee65a1683531f348af4dd3f9d96a84..f56f96a8809747a5c52fd976d01d64c4404723a7 100644
>--- a/Source/WebCore/editing/SplitElementCommand.cpp
>+++ b/Source/WebCore/editing/SplitElementCommand.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "SplitElementCommand.h"
> 
>+#include "CompositeEditCommand.h"
> #include "Element.h"
> #include "HTMLNames.h"
> #include <wtf/Assertions.h>
>diff --git a/Source/WebCore/editing/SplitTextNodeCommand.cpp b/Source/WebCore/editing/SplitTextNodeCommand.cpp
>index 73d609cac98e1e52827bfc3a7a37e2c85b1dfe1d..a16452c6a4aa35da9aaf0fa09e0cd0c5b052459f 100644
>--- a/Source/WebCore/editing/SplitTextNodeCommand.cpp
>+++ b/Source/WebCore/editing/SplitTextNodeCommand.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "SplitTextNodeCommand.h"
> 
>+#include "CompositeEditCommand.h"
> #include "Document.h"
> #include "DocumentMarkerController.h"
> #include "Text.h"
>diff --git a/Source/WebCore/loader/cache/CachedFontLoadRequest.h b/Source/WebCore/loader/cache/CachedFontLoadRequest.h
>index 405357a8e5d0b7f0b6a1ade4dca088a1b279f170..53d11f3f628374b96f1a22e69fafdaaddeaf9c50 100644
>--- a/Source/WebCore/loader/cache/CachedFontLoadRequest.h
>+++ b/Source/WebCore/loader/cache/CachedFontLoadRequest.h
>@@ -29,6 +29,7 @@
> #include "CachedFontClient.h"
> #include "CachedResourceHandle.h"
> #include "FontLoadRequest.h"
>+#include "FontSelectionAlgorithm.h"
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/graphics/FontTaggedSettings.h b/Source/WebCore/platform/graphics/FontTaggedSettings.h
>index 128daf7e63bc73da9fed1cc3a9e42acf56893988..0783c52b1c343e1dd5e787fa47404ce4ef65ad47 100644
>--- a/Source/WebCore/platform/graphics/FontTaggedSettings.h
>+++ b/Source/WebCore/platform/graphics/FontTaggedSettings.h
>@@ -28,6 +28,7 @@
> 
> #include <array>
> #include <wtf/HashTraits.h>
>+#include <wtf/Hasher.h>
> #include <wtf/Vector.h>
> 
> namespace WTF {
>diff --git a/Source/WebCore/platform/text/BidiContext.cpp b/Source/WebCore/platform/text/BidiContext.cpp
>index 97a6356af7143f419d9e6e3824d177ac171f4a67..45cd10bf34862c8eeea2b841c75c7fdda96f9dff 100644
>--- a/Source/WebCore/platform/text/BidiContext.cpp
>+++ b/Source/WebCore/platform/text/BidiContext.cpp
>@@ -22,6 +22,8 @@
> #include "config.h"
> #include "BidiContext.h"
> 
>+#include <mutex>
>+#include <wtf/NeverDestroyed.h>
> #include <wtf/Vector.h>
> 
> namespace WebCore {
>diff --git a/Source/WebCore/workers/WorkerGlobalScopeProxy.h b/Source/WebCore/workers/WorkerGlobalScopeProxy.h
>index 769d95d9abc8ec70ad14164a301ebdfb7ddf049e..38c2c88b7e49bb0536be196ae24ac536fee98ff8 100644
>--- a/Source/WebCore/workers/WorkerGlobalScopeProxy.h
>+++ b/Source/WebCore/workers/WorkerGlobalScopeProxy.h
>@@ -40,6 +40,7 @@
> namespace WebCore {
> 
> class ContentSecurityPolicyResponseHeaders;
>+class ScriptBuffer;
> class ScriptExecutionContext;
> class Worker;
> enum class ReferrerPolicy : uint8_t;
>diff --git a/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp b/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp
>index 6210653e33c6b83e5cc085770760f94f13e92b61..499da18d174fe78928b873ca72cb7ee1ae0a5d9f 100644
>--- a/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp
>+++ b/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp
>@@ -28,6 +28,7 @@
> #if ENABLE(WEB_RTC)
> 
> #include "NetworkConnectionToWebProcessMessages.h"
>+#include "NetworkProcessConnection.h"
> #include "RTCDataChannelRemoteManagerMessages.h"
> #include "RTCDataChannelRemoteManagerProxyMessages.h"
> #include "WebProcess.h"
>@@ -64,15 +65,15 @@ void RTCDataChannelRemoteManager::setConnection(IPC::Connection* connection)
> 
> bool RTCDataChannelRemoteManager::connectToRemoteSource(WebCore::RTCDataChannelIdentifier localIdentifier, WebCore::RTCDataChannelIdentifier remoteIdentifier)
> {
>-    ASSERT(Process::identifier() == localIdentifier.processIdentifier);
>-    if (Process::identifier() != localIdentifier.processIdentifier)
>+    ASSERT(WebCore::Process::identifier() == localIdentifier.processIdentifier);
>+    if (WebCore::Process::identifier() != localIdentifier.processIdentifier)
>         return false;
> 
>     auto handler = WebCore::RTCDataChannel::handlerFromIdentifier(localIdentifier.channelIdentifier);
>     if (!handler)
>         return false;
> 
>-    auto iterator = m_sources.add(remoteIdentifier.channelIdentifier, RTCDataChannelRemoteSource::create(remoteIdentifier, makeUniqueRefFromNonNullUniquePtr(WTFMove(handler)), remoteSourceConnection()));
>+    auto iterator = m_sources.add(remoteIdentifier.channelIdentifier, WebCore::RTCDataChannelRemoteSource::create(remoteIdentifier, makeUniqueRefFromNonNullUniquePtr(WTFMove(handler)), remoteSourceConnection()));
>     return iterator.isNewEntry;
> }
> 
>@@ -92,8 +93,8 @@ WebCore::RTCDataChannelRemoteSourceConnection& RTCDataChannelRemoteManager::remo
> 
> void RTCDataChannelRemoteManager::postTaskToHandler(WebCore::RTCDataChannelIdentifier handlerIdentifier, Function<void(WebCore::RTCDataChannelRemoteHandler&)>&& function)
> {
>-    ASSERT(Process::identifier() == handlerIdentifier.processIdentifier);
>-    if (Process::identifier() != handlerIdentifier.processIdentifier)
>+    ASSERT(WebCore::Process::identifier() == handlerIdentifier.processIdentifier);
>+    if (WebCore::Process::identifier() != handlerIdentifier.processIdentifier)
>         return;
> 
>     auto iterator = m_handlers.find(handlerIdentifier.channelIdentifier);
>@@ -107,10 +108,10 @@ void RTCDataChannelRemoteManager::postTaskToHandler(WebCore::RTCDataChannelIdent
>     });
> }
> 
>-RTCDataChannelRemoteSource* RTCDataChannelRemoteManager::sourceFromIdentifier(WebCore::RTCDataChannelIdentifier sourceIdentifier)
>+WebCore::RTCDataChannelRemoteSource* RTCDataChannelRemoteManager::sourceFromIdentifier(WebCore::RTCDataChannelIdentifier sourceIdentifier)
> {
>-    ASSERT(Process::identifier() == sourceIdentifier.processIdentifier);
>-    if (Process::identifier() != sourceIdentifier.processIdentifier)
>+    ASSERT(WebCore::Process::identifier() == sourceIdentifier.processIdentifier);
>+    if (WebCore::Process::identifier() != sourceIdentifier.processIdentifier)
>         return nullptr;
> 
>     return m_sources.get(sourceIdentifier.channelIdentifier);
>diff --git a/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp b/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp
>index 112fee24a1c08d9156f72428882fb1863cf8f456..6a8c63210d272ab33e92c11befcdf039b60ff7c5 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp
>@@ -32,6 +32,7 @@
> #include "WebFrame.h"
> #include "WebPage.h"
> #include "WebPageProxyMessages.h"
>+#include "WebProcess.h"
> #include "WebURLSchemeHandlerProxy.h"
> #include <WebCore/NetworkLoadMetrics.h>
> #include <WebCore/ResourceError.h>

Actions: View | Formatted Diff | Diff

Attachments on bug 222652: 426693