Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (276383 => 276384)
--- trunk/Source/_javascript_Core/ChangeLog 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-04-21 19:42:35 UTC (rev 276384)
@@ -1,3 +1,33 @@
+2021-04-21 Adrian Perez de Castro <[email protected]>
+
+ 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 <[email protected]>
Static asserts in WasmAirIRGenerator.cpp and WasmB3IRGenerator.cpp trigger -Wnonnull warnings with GCC 11
Modified: trunk/Source/_javascript_Core/bytecode/JumpTable.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/bytecode/JumpTable.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/bytecode/JumpTable.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -30,8 +30,6 @@
#include "config.h"
#include "JumpTable.h"
-#include <wtf/text/StringHash.h>
-
namespace JSC {
} // namespace JSC
Modified: trunk/Source/_javascript_Core/bytecode/JumpTable.h (276383 => 276384)
--- trunk/Source/_javascript_Core/bytecode/JumpTable.h 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/bytecode/JumpTable.h 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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 {
Modified: trunk/Source/_javascript_Core/bytecode/SpeculatedType.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/bytecode/SpeculatedType.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/bytecode/SpeculatedType.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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"
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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 @@
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());
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h (276383 => 276384)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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 @@
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);
Modified: trunk/Source/_javascript_Core/dfg/DFGDesiredGlobalProperties.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/dfg/DFGDesiredGlobalProperties.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/dfg/DFGDesiredGlobalProperties.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -31,6 +31,7 @@
#include "CodeBlock.h"
#include "DFGCommonData.h"
#include "DFGDesiredIdentifiers.h"
+#include "DFGDesiredWatchpoints.h"
#include "JSGlobalObject.h"
namespace JSC { namespace DFG {
Modified: trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -31,6 +31,7 @@
#include "FTLAbbreviatedTypes.h"
#include "FTLOutput.h"
#include "FTLTypedPointer.h"
+#include "JSCJSValueInlines.h"
#include "Options.h"
namespace JSC { namespace FTL {
Modified: trunk/Source/_javascript_Core/runtime/JSCustomGetterFunction.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/runtime/JSCustomGetterFunction.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/runtime/JSCustomGetterFunction.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,6 +26,7 @@
#include "config.h"
#include "JSCustomGetterFunction.h"
+#include "IdentifierInlines.h"
#include "JSCJSValueInlines.h"
namespace JSC {
Modified: trunk/Source/_javascript_Core/runtime/JSCustomSetterFunction.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/runtime/JSCustomSetterFunction.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/runtime/JSCustomSetterFunction.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,6 +26,7 @@
#include "config.h"
#include "JSCustomSetterFunction.h"
+#include "IdentifierInlines.h"
#include "JSCJSValueInlines.h"
namespace JSC {
Modified: trunk/Source/_javascript_Core/runtime/SetPrototype.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/runtime/SetPrototype.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/runtime/SetPrototype.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -27,6 +27,7 @@
#include "SetPrototype.h"
#include "BuiltinNames.h"
+#include "HashMapImplInlines.h"
#include "JSCInlines.h"
#include "JSSet.h"
#include "JSSetIterator.h"
Modified: trunk/Source/_javascript_Core/runtime/VMTraps.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/runtime/VMTraps.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/runtime/VMTraps.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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>
Modified: trunk/Source/_javascript_Core/runtime/WeakSetConstructor.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/runtime/WeakSetConstructor.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/runtime/WeakSetConstructor.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -29,6 +29,7 @@
#include "IteratorOperations.h"
#include "JSCInlines.h"
#include "JSWeakSet.h"
+#include "WeakMapImplInlines.h"
#include "WeakSetPrototype.h"
namespace JSC {
Modified: trunk/Source/_javascript_Core/runtime/WeakSetPrototype.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/runtime/WeakSetPrototype.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/runtime/WeakSetPrototype.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,8 +26,10 @@
#include "config.h"
#include "WeakSetPrototype.h"
+#include "HashMapImplInlines.h"
#include "JSCInlines.h"
#include "JSWeakSet.h"
+#include "WeakMapImplInlines.h"
namespace JSC {
Modified: trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyTable.cpp (276383 => 276384)
--- trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyTable.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyTable.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -30,6 +30,7 @@
#include "JSCInlines.h"
#include "JSWebAssemblyInstance.h"
+#include "ObjectConstructor.h"
namespace JSC {
Modified: trunk/Source/WebCore/ChangeLog (276383 => 276384)
--- trunk/Source/WebCore/ChangeLog 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/ChangeLog 2021-04-21 19:42:35 UTC (rev 276384)
@@ -1,3 +1,47 @@
+2021-04-21 Adrian Perez de Castro <[email protected]>
+
+ 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 Aditya Keerthi <[email protected]>
[iOS][FCR] Update datalist dropdown indicator
Modified: trunk/Source/WebCore/bindings/js/JSWebXRRigidTransformCustom.cpp (276383 => 276384)
--- trunk/Source/WebCore/bindings/js/JSWebXRRigidTransformCustom.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/bindings/js/JSWebXRRigidTransformCustom.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -28,6 +28,7 @@
#if ENABLE(WEBXR)
#include "JSWebXRRigidTransform.h"
+#include "JSDOMConvertBufferSource.h"
#include "WebXRRigidTransform.h"
namespace WebCore {
Modified: trunk/Source/WebCore/bindings/js/JSWebXRSpaceCustom.cpp (276383 => 276384)
--- trunk/Source/WebCore/bindings/js/JSWebXRSpaceCustom.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/bindings/js/JSWebXRSpaceCustom.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -28,6 +28,7 @@
#if ENABLE(WEBXR)
#include "JSWebXRSpace.h"
+#include "JSWebXRReferenceSpace.h"
#include "WebXRReferenceSpace.h"
namespace WebCore {
Modified: trunk/Source/WebCore/bindings/js/JSWebXRViewCustom.cpp (276383 => 276384)
--- trunk/Source/WebCore/bindings/js/JSWebXRViewCustom.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/bindings/js/JSWebXRViewCustom.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -28,6 +28,7 @@
#if ENABLE(WEBXR)
#include "JSWebXRView.h"
+#include "JSDOMConvertBufferSource.h"
#include "WebXRView.h"
namespace WebCore {
Modified: trunk/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp (276383 => 276384)
--- trunk/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -36,6 +36,7 @@
#include "ScriptController.h"
#include "ScriptModuleLoader.h"
#include "ScriptSourceCode.h"
+#include "ServiceWorkerGlobalScope.h"
#include "WorkerScriptFetcher.h"
#include "WorkerScriptLoader.h"
Modified: trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp (276383 => 276384)
--- trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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"
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.cpp (276383 => 276384)
--- trunk/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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 @@
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 @@
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 @@
}
// 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());
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.h (276383 => 276384)
--- trunk/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.h 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParserWorkerSafe.h 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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>
Modified: trunk/Source/WebCore/dom/DocumentFontLoader.cpp (276383 => 276384)
--- trunk/Source/WebCore/dom/DocumentFontLoader.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/dom/DocumentFontLoader.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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 {
Modified: trunk/Source/WebCore/editing/AppendNodeCommand.cpp (276383 => 276384)
--- trunk/Source/WebCore/editing/AppendNodeCommand.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/AppendNodeCommand.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -27,6 +27,7 @@
#include "AppendNodeCommand.h"
#include "AXObjectCache.h"
+#include "CompositeEditCommand.h"
#include "Document.h"
#include "Editing.h"
#include "RenderElement.h"
Modified: trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp (276383 => 276384)
--- trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/DeleteFromTextNodeCommand.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,8 +26,9 @@
#include "config.h"
#include "DeleteFromTextNodeCommand.h"
+#include "CompositeEditCommand.h"
+#include "Document.h"
#include "Editing.h"
-#include "Document.h"
#include "Text.h"
namespace WebCore {
Modified: trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp (276383 => 276384)
--- trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,6 +26,7 @@
#include "config.h"
#include "InsertIntoTextNodeCommand.h"
+#include "CompositeEditCommand.h"
#include "Document.h"
#include "Editor.h"
#include "EditorClient.h"
Modified: trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp (276383 => 276384)
--- trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/InsertNodeBeforeCommand.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,6 +26,7 @@
#include "config.h"
#include "InsertNodeBeforeCommand.h"
+#include "CompositeEditCommand.h"
#include "Document.h"
#include "Editing.h"
#include "RenderElement.h"
Modified: trunk/Source/WebCore/editing/MergeIdenticalElementsCommand.h (276383 => 276384)
--- trunk/Source/WebCore/editing/MergeIdenticalElementsCommand.h 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/MergeIdenticalElementsCommand.h 2021-04-21 19:42:35 UTC (rev 276384)
@@ -25,7 +25,7 @@
#pragma once
-#include "EditCommand.h"
+#include "CompositeEditCommand.h"
namespace WebCore {
Modified: trunk/Source/WebCore/editing/RemoveNodeCommand.cpp (276383 => 276384)
--- trunk/Source/WebCore/editing/RemoveNodeCommand.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/RemoveNodeCommand.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,6 +26,7 @@
#include "config.h"
#include "RemoveNodeCommand.h"
+#include "CompositeEditCommand.h"
#include "Editing.h"
#include "RenderElement.h"
#include <wtf/Assertions.h>
Modified: trunk/Source/WebCore/editing/SetNodeAttributeCommand.cpp (276383 => 276384)
--- trunk/Source/WebCore/editing/SetNodeAttributeCommand.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/SetNodeAttributeCommand.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,6 +26,7 @@
#include "config.h"
#include "SetNodeAttributeCommand.h"
+#include "CompositeEditCommand.h"
#include "Element.h"
#include <wtf/Assertions.h>
Modified: trunk/Source/WebCore/editing/SetSelectionCommand.cpp (276383 => 276384)
--- trunk/Source/WebCore/editing/SetSelectionCommand.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/SetSelectionCommand.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,6 +26,7 @@
#include "config.h"
#include "SetSelectionCommand.h"
+#include "CompositeEditCommand.h"
#include "Document.h"
#include "Frame.h"
Modified: trunk/Source/WebCore/editing/SplitElementCommand.cpp (276383 => 276384)
--- trunk/Source/WebCore/editing/SplitElementCommand.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/SplitElementCommand.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,6 +26,7 @@
#include "config.h"
#include "SplitElementCommand.h"
+#include "CompositeEditCommand.h"
#include "Element.h"
#include "HTMLNames.h"
#include <wtf/Assertions.h>
Modified: trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp (276383 => 276384)
--- trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/editing/SplitTextNodeCommand.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -26,6 +26,7 @@
#include "config.h"
#include "SplitTextNodeCommand.h"
+#include "CompositeEditCommand.h"
#include "Document.h"
#include "DocumentMarkerController.h"
#include "Text.h"
Modified: trunk/Source/WebCore/loader/cache/CachedFontLoadRequest.h (276383 => 276384)
--- trunk/Source/WebCore/loader/cache/CachedFontLoadRequest.h 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/loader/cache/CachedFontLoadRequest.h 2021-04-21 19:42:35 UTC (rev 276384)
@@ -29,6 +29,7 @@
#include "CachedFontClient.h"
#include "CachedResourceHandle.h"
#include "FontLoadRequest.h"
+#include "FontSelectionAlgorithm.h"
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/FontTaggedSettings.h (276383 => 276384)
--- trunk/Source/WebCore/platform/graphics/FontTaggedSettings.h 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/platform/graphics/FontTaggedSettings.h 2021-04-21 19:42:35 UTC (rev 276384)
@@ -28,6 +28,7 @@
#include <array>
#include <wtf/HashTraits.h>
+#include <wtf/Hasher.h>
#include <wtf/Vector.h>
namespace WTF {
Modified: trunk/Source/WebCore/platform/text/BidiContext.cpp (276383 => 276384)
--- trunk/Source/WebCore/platform/text/BidiContext.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/platform/text/BidiContext.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -22,6 +22,8 @@
#include "config.h"
#include "BidiContext.h"
+#include <mutex>
+#include <wtf/NeverDestroyed.h>
#include <wtf/Vector.h>
namespace WebCore {
Modified: trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h (276383 => 276384)
--- trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h 2021-04-21 19:42:35 UTC (rev 276384)
@@ -40,6 +40,7 @@
namespace WebCore {
class ContentSecurityPolicyResponseHeaders;
+class ScriptBuffer;
class ScriptExecutionContext;
class Worker;
enum class ReferrerPolicy : uint8_t;
Modified: trunk/Source/WebKit/ChangeLog (276383 => 276384)
--- trunk/Source/WebKit/ChangeLog 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebKit/ChangeLog 2021-04-21 19:42:35 UTC (rev 276384)
@@ -1,3 +1,19 @@
+2021-04-21 Adrian Perez de Castro <[email protected]>
+
+ 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 Kimmo Kinnunen <[email protected]>
Fix build break after r276363
Modified: trunk/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp (276383 => 276384)
--- trunk/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebKit/WebProcess/Network/webrtc/RTCDataChannelRemoteManager.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -28,6 +28,7 @@
#if ENABLE(WEB_RTC)
#include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
#include "RTCDataChannelRemoteManagerMessages.h"
#include "RTCDataChannelRemoteManagerProxyMessages.h"
#include "WebProcess.h"
@@ -64,8 +65,8 @@
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);
@@ -72,7 +73,7 @@
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 @@
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 @@
});
}
-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);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp (276383 => 276384)
--- trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp 2021-04-21 19:41:14 UTC (rev 276383)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebURLSchemeTaskProxy.cpp 2021-04-21 19:42:35 UTC (rev 276384)
@@ -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>
