Skip to content

Commit

Permalink
Cherry-pick cc4248a. rdar://problem/76241764
Browse files Browse the repository at this point in the history
    Non-unified build fixes
    https://bugs.webkit.org/show_bug.cgi?id=249458

    Reviewed by Michael Catanzaro.

    * Source/JavaScriptCore/b3/air/AirAllocateRegistersAndStackAndGenerateCode.cpp:
    * Source/JavaScriptCore/b3/air/AirAllocateRegistersByGraphColoring.cpp:
    * Source/JavaScriptCore/runtime/BufferMemoryHandle.cpp:
    * Source/JavaScriptCore/runtime/WaiterListManager.cpp:
    * Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp:
    * Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp:
    * Source/WebCore/animation/DeclarativeAnimation.cpp:
    * Source/WebCore/animation/WebAnimation.cpp:
    * Source/WebCore/bindings/js/InternalWritableStream.cpp:
    * Source/WebCore/bindings/js/StructuredClone.cpp:
    * Source/WebCore/css/CSSCustomPropertyValue.cpp:
    * Source/WebCore/css/CSSValue.cpp:
    * Source/WebCore/css/CSSValueList.cpp:
    * Source/WebCore/css/ComputedStyleExtractor.cpp:
    * Source/WebCore/css/StylePropertyShorthand.h:
    * Source/WebCore/css/parser/CSSCustomPropertySyntax.cpp:
    * Source/WebCore/css/parser/CSSPropertyParser.cpp:
    * Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:
    * Source/WebCore/css/query/MediaQueryParser.cpp:
    * Source/WebCore/css/typedom/HashMapStylePropertyMapReadOnly.cpp:
    * Source/WebCore/css/typedom/InlineStylePropertyMap.cpp:
    * Source/WebCore/html/ImageBitmapBacking.cpp:
    * Source/WebCore/html/OffscreenCanvas.cpp:
    * Source/WebCore/loader/cache/AllowedFonts.cpp:
    * Source/WebCore/loader/cache/CachedFont.cpp:
    * Source/WebCore/page/FrameSnapshotting.cpp:
    * Source/WebCore/page/RemoteFrame.cpp:
    * Source/WebCore/page/RemoteFrame.h:
    * Source/WebCore/platform/graphics/controls/ControlFactory.cpp:
    * Source/WebCore/rendering/GridMasonryLayout.cpp:
    * Source/WebCore/rendering/GridMasonryLayout.h:
    * Source/WebCore/style/UserAgentStyle.cpp:
    * Source/WebCore/svg/SVGLengthValue.cpp:
    * Source/WebKit/Shared/WebEventConversion.h:
    * Source/WebKit/Shared/WebPageCreationParameters.h:
    * Source/WebKit/UIProcess/Notifications/ServiceWorkerNotificationHandler.cpp:
    * Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp:
    * Source/WebKit/UIProcess/ProvisionalFrameProxy.h:
    * Source/WebKit/WebProcess/WebCoreSupport/WebRemoteFrameClient.h:
    * Source/WebKit/WebProcess/WebCoreSupport/WebWorkerClient.cpp:

    Canonical link: https://commits.webkit.org/258011@main

Canonical link: https://commits.webkit.org/257979.7@safari-7615.1.16-branch
  • Loading branch information
bertogg authored and alancoon committed Dec 20, 2022
1 parent a580854 commit 492b0d9
Show file tree
Hide file tree
Showing 40 changed files with 57 additions and 2 deletions.
Expand Up @@ -38,6 +38,7 @@
#include "CCallHelpers.h"
#include "DisallowMacroScratchRegisterUsage.h"
#include "Reg.h"
#include <wtf/ListDump.h>

namespace JSC { namespace B3 { namespace Air {

Expand Down
Expand Up @@ -40,6 +40,7 @@
#include <wtf/HashSet.h>
#include <wtf/HashTraits.h>
#include <wtf/InterferenceGraph.h>
#include <wtf/ListDump.h>
#include <wtf/SmallSet.h>
#include <wtf/Vector.h>

Expand Down
2 changes: 2 additions & 0 deletions Source/JavaScriptCore/runtime/BufferMemoryHandle.cpp
Expand Up @@ -35,6 +35,8 @@
#include <wtf/DataLog.h>
#include <wtf/Gigacage.h>
#include <wtf/Lock.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/OSAllocator.h>
#include <wtf/Platform.h>
#include <wtf/PrintStream.h>
#include <wtf/SafeStrerror.h>
Expand Down
2 changes: 1 addition & 1 deletion Source/JavaScriptCore/runtime/WaiterListManager.cpp
Expand Up @@ -22,11 +22,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once

#include "config.h"
#include "WaiterListManager.h"

#include "JSCInlines.h"
#include "JSGlobalObject.h"
#include "JSLock.h"
#include "ObjectConstructor.h"
Expand Down
1 change: 1 addition & 0 deletions Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp
Expand Up @@ -32,6 +32,7 @@
#include "CatchScope.h"
#include "DeferredWorkTimer.h"
#include "Exception.h"
#include "JSArrayBufferViewInlines.h"
#include "JSCBuiltins.h"
#include "JSGlobalObjectInlines.h"
#include "JSModuleNamespaceObject.h"
Expand Down
Expand Up @@ -31,6 +31,7 @@
#include "ArrayBuffer.h"
#include "ButterflyInlines.h"
#include "JSArrayBuffer.h"
#include "JSArrayBufferViewInlines.h"
#include "JSCJSValueInlines.h"
#include "JSGlobalObjectInlines.h"
#include "JSObjectInlines.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/Modules/badge/EmptyBadgeClient.h
Expand Up @@ -26,6 +26,7 @@
#pragma once

#include "BadgeClient.h"
#include <wtf/NeverDestroyed.h>

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/animation/DeclarativeAnimation.cpp
Expand Up @@ -29,6 +29,7 @@
#include "Animation.h"
#include "CSSAnimation.h"
#include "CSSTransition.h"
#include "DeclarativeAnimationEvent.h"
#include "DocumentTimeline.h"
#include "Element.h"
#include "EventNames.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/animation/WebAnimation.cpp
Expand Up @@ -29,6 +29,7 @@
#include "AnimationEffect.h"
#include "AnimationPlaybackEvent.h"
#include "AnimationTimeline.h"
#include "CSSPropertyAnimation.h"
#include "CSSStyleDeclaration.h"
#include "CSSUnitValue.h"
#include "CSSUnits.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/bindings/js/InternalWritableStream.cpp
Expand Up @@ -28,6 +28,7 @@

#include "Exception.h"
#include "WebCoreJSClientData.h"
#include <JavaScriptCore/JSArrayBufferViewInlines.h>

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/bindings/js/StructuredClone.cpp
Expand Up @@ -28,6 +28,7 @@
#include "StructuredClone.h"

#include "JSDOMBinding.h"
#include "JSDOMConvertBufferSource.h"
#include "JSDOMExceptionHandling.h"
#include <JavaScriptCore/JSTypedArrays.h>

Expand Down
4 changes: 4 additions & 0 deletions Source/WebCore/css/CSSCustomPropertyValue.cpp
Expand Up @@ -27,9 +27,13 @@
#include "CSSCustomPropertyValue.h"

#include "CSSCalcValue.h"
#include "CSSFunctionValue.h"
#include "CSSMarkup.h"
#include "CSSParserIdioms.h"
#include "CSSTokenizer.h"
#include "ColorSerialization.h"
#include "ComputedStyleExtractor.h"
#include "RenderStyle.h"

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/CSSValue.cpp
Expand Up @@ -76,6 +76,7 @@
#include "DeprecatedCSSOMPrimitiveValue.h"
#include "DeprecatedCSSOMValueList.h"
#include "EventTarget.h"
#include "Rect.h"

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/CSSValueList.cpp
Expand Up @@ -21,6 +21,7 @@
#include "config.h"
#include "CSSValueList.h"

#include "CSSPrimitiveValue.h"
#include <wtf/text/StringBuilder.h>

namespace WebCore {
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/ComputedStyleExtractor.cpp
Expand Up @@ -43,6 +43,7 @@
#include "CSSPropertyAnimation.h"
#include "CSSRayValue.h"
#include "CSSReflectValue.h"
#include "CSSRegisteredCustomProperty.h"
#include "CSSShadowValue.h"
#include "CSSTimingFunctionValue.h"
#include "CSSTransformListValue.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/StylePropertyShorthand.h
Expand Up @@ -22,6 +22,7 @@
#pragma once

#include "CSSPropertyNames.h"
#include "CSSValueKeywords.h"
#include <wtf/Vector.h>

namespace WebCore {
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/parser/CSSCustomPropertySyntax.cpp
Expand Up @@ -26,6 +26,7 @@
#include "CSSCustomPropertySyntax.h"

#include "CSSParserIdioms.h"
#include "CSSParserTokenRange.h"
#include "CSSTokenizer.h"
#include "ParsingUtilities.h"

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/parser/CSSPropertyParser.cpp
Expand Up @@ -35,6 +35,7 @@
#include "CSSComputedStyleDeclaration.h"
#include "CSSCustomPropertyValue.h"
#include "CSSFontPaletteValuesOverrideColorsValue.h"
#include "CSSFontStyleRangeValue.h"
#include "CSSFontVariantLigaturesParser.h"
#include "CSSFontVariantNumericParser.h"
#include "CSSGridLineNamesValue.h"
Expand Down
2 changes: 2 additions & 0 deletions Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
Expand Up @@ -29,6 +29,8 @@

#include "config.h"
#include "CSSPropertyParserHelpers.h"
#include "CSSPropertyParser.h"
#include "CSSPropertyParsing.h"

#include "CSSBackgroundRepeatValue.h"
#include "CSSBasicShapes.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/query/MediaQueryParser.cpp
Expand Up @@ -28,6 +28,7 @@
#include "CSSMarkup.h"
#include "CSSTokenizer.h"
#include "CSSValueKeywords.h"
#include "CommonAtomStrings.h"
#include "GenericMediaQuerySerialization.h"
#include "MediaQueryFeatures.h"

Expand Down
Expand Up @@ -26,6 +26,8 @@
#include "config.h"
#include "HashMapStylePropertyMapReadOnly.h"

#include "CSSPropertyParser.h"

namespace WebCore {

Ref<HashMapStylePropertyMapReadOnly> HashMapStylePropertyMapReadOnly::create(HashMap<AtomString, RefPtr<CSSValue>>&& map)
Expand Down
3 changes: 3 additions & 0 deletions Source/WebCore/css/typedom/InlineStylePropertyMap.cpp
Expand Up @@ -26,6 +26,9 @@
#include "config.h"
#include "InlineStylePropertyMap.h"

#include "CSSCustomPropertyValue.h"
#include "Document.h"
#include "StyleProperties.h"
#include "StyledElement.h"

namespace WebCore {
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/html/ImageBitmapBacking.cpp
Expand Up @@ -27,6 +27,7 @@
#include "ImageBitmapBacking.h"

#include "Chrome.h"
#include "Page.h"
#include "WorkerClient.h"
#include "WorkerGlobalScope.h"

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/html/OffscreenCanvas.cpp
Expand Up @@ -41,6 +41,7 @@
#include "JSDOMPromiseDeferred.h"
#include "MIMETypeRegistry.h"
#include "OffscreenCanvasRenderingContext2D.h"
#include "Page.h"
#include "PlaceholderRenderingContext.h"
#include "WorkerClient.h"
#include "WorkerGlobalScope.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/loader/cache/AllowedFonts.cpp
Expand Up @@ -30,6 +30,7 @@
#include <wtf/NeverDestroyed.h>
#include <wtf/RobinHoodHashSet.h>
#include <wtf/text/AtomString.h>
#include <wtf/text/AtomStringHash.h>
#include <wtf/text/Base64.h>

namespace WebCore {
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/loader/cache/CachedFont.cpp
Expand Up @@ -35,6 +35,7 @@
#include "FontCustomPlatformData.h"
#include "FontDescription.h"
#include "FontPlatformData.h"
#include "MemoryCache.h"
#include "SharedBuffer.h"
#include "SubresourceLoader.h"
#include "TextResourceDecoder.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/page/FrameSnapshotting.cpp
Expand Up @@ -39,6 +39,7 @@
#include "FrameView.h"
#include "GeometryUtilities.h"
#include "GraphicsContext.h"
#include "HostWindow.h"
#include "ImageBuffer.h"
#include "Page.h"
#include "RenderAncestorIterator.h"
Expand Down
2 changes: 2 additions & 0 deletions Source/WebCore/page/RemoteFrame.cpp
Expand Up @@ -26,6 +26,8 @@
#include "config.h"
#include "RemoteFrame.h"

#include "Document.h"
#include "HTMLFrameOwnerElement.h"
#include "RemoteDOMWindow.h"
#include "RemoteFrameClient.h"

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/page/RemoteFrame.h
Expand Up @@ -28,6 +28,7 @@
#include "AbstractFrame.h"
#include <wtf/RefPtr.h>
#include <wtf/TypeCasts.h>
#include <wtf/UniqueRef.h>

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/rendering/GridMasonryLayout.cpp
Expand Up @@ -27,6 +27,7 @@

#include "GridLayoutFunctions.h"
#include "GridPositionsResolver.h"
#include "RenderGrid.h"
#include "WritingMode.h"

namespace WebCore {
Expand Down
4 changes: 3 additions & 1 deletion Source/WebCore/rendering/GridMasonryLayout.h
Expand Up @@ -28,9 +28,11 @@
#include "GridPositionsResolver.h"
#include "LayoutUnit.h"
#include "RenderBox.h"
#include "RenderGrid.h"

namespace WebCore {

class RenderGrid;

class GridMasonryLayout {
public:
GridMasonryLayout(RenderGrid& renderGrid)
Expand Down
2 changes: 2 additions & 0 deletions Source/WebCore/style/UserAgentStyle.cpp
Expand Up @@ -44,7 +44,9 @@
#include "HTMLHtmlElement.h"
#include "HTMLInputElement.h"
#include "HTMLMediaElement.h"
#include "HTMLMeterElement.h"
#include "HTMLObjectElement.h"
#include "HTMLProgressElement.h"
#include "HTMLSpanElement.h"
#include "MathMLElement.h"
#include "MediaQueryEvaluator.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/svg/SVGLengthValue.cpp
Expand Up @@ -24,6 +24,7 @@

#include "AnimationUtilities.h"
#include "CSSPrimitiveValue.h"
#include "SVGElement.h"
#include "SVGLengthContext.h"
#include "SVGParserUtilities.h"
#include <wtf/text/StringConcatenateNumbers.h>
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/Shared/WebEventConversion.h
Expand Up @@ -26,6 +26,7 @@
#ifndef WebEventConversion_h
#define WebEventConversion_h

#include "WebEventModifier.h"
#include <WebCore/PlatformKeyboardEvent.h>
#include <WebCore/PlatformMouseEvent.h>
#include <WebCore/PlatformWheelEvent.h>
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/Shared/WebPageCreationParameters.h
Expand Up @@ -40,6 +40,7 @@
#include <WebCore/ContentSecurityPolicy.h>
#include <WebCore/DestinationColorSpace.h>
#include <WebCore/FloatSize.h>
#include <WebCore/FrameIdentifier.h>
#include <WebCore/HighlightVisibility.h>
#include <WebCore/IntSize.h>
#include <WebCore/LayoutMilestone.h>
Expand Down
Expand Up @@ -26,6 +26,7 @@
#include "config.h"
#include "ServiceWorkerNotificationHandler.h"

#include "Logging.h"
#include "WebsiteDataStore.h"
#include <WebCore/NotificationData.h>
#include <wtf/Scope.h>
Expand Down
3 changes: 3 additions & 0 deletions Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
Expand Up @@ -32,9 +32,12 @@
#include "LoadParameters.h"
#include "WebFrameProxy.h"
#include "WebFrameProxyMessages.h"
#include "WebPageMessages.h"
#include "WebPageProxyMessages.h"
#include "WebProcessMessages.h"

using namespace WebCore;

namespace WebKit {

ProvisionalFrameProxy::ProvisionalFrameProxy(WebFrameProxy& frame, Ref<WebProcessProxy>&& process, const WebCore::ResourceRequest& request)
Expand Down
4 changes: 4 additions & 0 deletions Source/WebKit/UIProcess/ProvisionalFrameProxy.h
Expand Up @@ -27,7 +27,11 @@

#include "MessageReceiver.h"
#include "MessageSender.h"
#include "UserData.h"
#include "VisitedLinkStore.h"
#include "WebPageProxyIdentifier.h"
#include <WebCore/CertificateInfo.h>
#include <WebCore/DocumentLoader.h>
#include <WebCore/FrameIdentifier.h>
#include <WebCore/FrameLoaderTypes.h>
#include <WebCore/PageIdentifier.h>
Expand Down
Expand Up @@ -25,6 +25,7 @@

#pragma once

#include "WebFrame.h"
#include <WebCore/RemoteFrameClient.h>

namespace WebKit {
Expand Down
Expand Up @@ -30,6 +30,7 @@
#include "RemoteImageBufferProxy.h"
#include "RemoteRenderingBackendProxy.h"
#include "WebProcess.h"
#include "WebPage.h"

#if ENABLE(WEBGL) && ENABLE(GPU_PROCESS)
#include "RemoteGraphicsContextGLProxy.h"
Expand Down

0 comments on commit 492b0d9

Please sign in to comment.