Skip to content

Commit

Permalink
Non-unified build fixes, late October 2022 edition
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=247211

Reviewed by Yusuke Suzuki.

* Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.cpp:
* Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorSocketEndpoint.cpp:
* Source/WTF/wtf/win/FileSystemWin.cpp:
* Source/WebCore/Modules/reporting/ReportingScope.cpp:
* Source/WebCore/css/CSSFontValue.cpp:
* Source/WebCore/css/CSSValue.cpp:
* Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:
* Source/WebCore/css/typedom/DeclaredStylePropertyMap.cpp:
* Source/WebCore/css/typedom/StylePropertyMap.cpp:
* Source/WebCore/dom/NodeList.h:
* Source/WebCore/html/HTMLMetaElement.cpp:
* Source/WebCore/html/URLSearchParams.h:
* Source/WebCore/platform/graphics/filters/FilterTargetSwitcher.h:
* Source/WebCore/platform/network/win/DownloadBundleWin.cpp:
* Source/WebCore/platform/win/KeyEventWin.cpp:
* Source/WebCore/rendering/style/StyleCanvasImage.h:
* Source/WebCore/rendering/style/StyleCursorImage.h:
* Source/WebCore/rendering/style/StyleGeneratedImage.cpp:
* Source/WebCore/style/FilterOperationsBuilder.cpp:
* Source/WebCore/style/FilterOperationsBuilder.h:
* Source/WebCore/svg/SVGComponentTransferFunctionElement.cpp:
* Source/WebDriver/socket/SessionHostSocket.cpp:
* Source/WebKit/GPUProcess/graphics/ImageBufferShareableAllocator.cpp:
* Source/WebKit/GPUProcess/graphics/ImageBufferShareableAllocator.h:
* Source/WebKit/GPUProcess/graphics/RemoteImageBuffer.h:
* Source/WebKit/Platform/IPC/IPCUtilities.h:
* Source/WebKit/Shared/win/WebEventFactory.cpp:
* Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp:
* Source/WebKit/WebProcess/WebCoreSupport/WebMessagePortChannelProvider.h:

Canonical link: https://commits.webkit.org/256137@main
  • Loading branch information
donny-dont committed Oct 29, 2022
1 parent 72233df commit f4c8911
Show file tree
Hide file tree
Showing 29 changed files with 45 additions and 7 deletions.
Expand Up @@ -30,6 +30,7 @@

#include "RemoteInspectorMessageParser.h"
#include <wtf/MainThread.h>
#include <wtf/NeverDestroyed.h>

namespace Inspector {

Expand Down
Expand Up @@ -30,6 +30,7 @@

#include <wtf/CryptographicallyRandomNumber.h>
#include <wtf/MainThread.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/RunLoop.h>

namespace Inspector {
Expand Down
1 change: 1 addition & 0 deletions Source/WTF/wtf/win/FileSystemWin.cpp
Expand Up @@ -37,6 +37,7 @@
#include <windows.h>
#include <wtf/CryptographicallyRandomNumber.h>
#include <wtf/HashMap.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/text/win/WCharStringExtras.h>
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/Modules/reporting/ReportingScope.cpp
Expand Up @@ -28,6 +28,7 @@

#include "ContextDestructionObserver.h"
#include "Document.h"
#include "FormData.h"
#include "HeaderFieldTokenizer.h"
#include "RFC8941.h"
#include "Report.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/CSSFontValue.cpp
Expand Up @@ -21,6 +21,7 @@
#include "config.h"
#include "CSSFontValue.h"

#include "CSSFontStyleValue.h"
#include "CSSValueList.h"
#include <wtf/text/StringBuilder.h>

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

namespace WebCore {

Expand Down
16 changes: 9 additions & 7 deletions Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
Expand Up @@ -40,8 +40,10 @@
#include "CSSImageValue.h"
#include "CSSNamedImageValue.h"
#include "CSSPaintImageValue.h"
#include "CSSParser.h"
#include "CSSParserIdioms.h"
#include "CSSValuePool.h"
#include "CSSVariableData.h"
#include "CalculationCategory.h"
#include "ColorConversion.h"
#include "ColorInterpolation.h"
Expand Down Expand Up @@ -4612,19 +4614,19 @@ const AtomString& genericFontFamily(CSSValueID ident)
{
switch (ident) {
case CSSValueSerif:
return serifFamily.get();
return WebKitFontFamilyNames::serifFamily.get();
case CSSValueSansSerif:
return sansSerifFamily.get();
return WebKitFontFamilyNames::sansSerifFamily.get();
case CSSValueCursive:
return cursiveFamily.get();
return WebKitFontFamilyNames::cursiveFamily.get();
case CSSValueFantasy:
return fantasyFamily.get();
return WebKitFontFamilyNames::fantasyFamily.get();
case CSSValueMonospace:
return monospaceFamily.get();
return WebKitFontFamilyNames::monospaceFamily.get();
case CSSValueWebkitPictograph:
return pictographFamily.get();
return WebKitFontFamilyNames::pictographFamily.get();
case CSSValueSystemUi:
return systemUiFamily.get();
return WebKitFontFamilyNames::systemUiFamily.get();
default:
return emptyAtom();
}
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/typedom/DeclaredStylePropertyMap.cpp
Expand Up @@ -28,6 +28,7 @@

#include "CSSStyleRule.h"
#include "CSSStyleSheet.h"
#include "Document.h"
#include "StyleProperties.h"
#include "StyleRule.h"

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/css/typedom/StylePropertyMap.cpp
Expand Up @@ -28,6 +28,7 @@

#include "CSSPropertyNames.h"
#include "CSSPropertyParser.h"
#include "Document.h"

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/dom/NodeList.h
Expand Up @@ -31,6 +31,7 @@
namespace WebCore {

class Node;
class ScriptExecutionContext;

class NodeList : public ScriptWrappable, public RefCounted<NodeList> {
WTF_MAKE_ISO_ALLOCATED_EXPORT(NodeList, WEBCORE_EXPORT);
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/html/HTMLMetaElement.cpp
Expand Up @@ -34,6 +34,7 @@
#include "HTMLParserIdioms.h"
#include "MediaQueryEvaluator.h"
#include "MediaQueryParser.h"
#include "MediaQueryParserContext.h"
#include "RenderStyle.h"
#include "Settings.h"
#include "StyleResolveForDocument.h"
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/html/URLSearchParams.h
Expand Up @@ -33,6 +33,7 @@
namespace WebCore {

class DOMURL;
class ScriptExecutionContext;

class URLSearchParams : public RefCounted<URLSearchParams> {
public:
Expand Down
Expand Up @@ -27,6 +27,7 @@

#include "DestinationColorSpace.h"
#include "FloatRect.h"
#include <functional>

namespace WebCore {

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/platform/network/win/DownloadBundleWin.cpp
Expand Up @@ -29,6 +29,7 @@
#include <io.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/platform/win/KeyEventWin.cpp
Expand Up @@ -30,6 +30,7 @@
#include <windows.h>
#include <wtf/ASCIICType.h>
#include <wtf/HexNumber.h>
#include <wtf/NeverDestroyed.h>

#ifndef MAPVK_VSC_TO_VK_EX
#define MAPVK_VSC_TO_VK_EX 3
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/rendering/style/StyleCanvasImage.h
Expand Up @@ -32,6 +32,7 @@

namespace WebCore {

class Document;
class HTMLCanvasElement;

class StyleCanvasImage final : public StyleGeneratedImage, public CanvasObserver {
Expand Down
2 changes: 2 additions & 0 deletions Source/WebCore/rendering/style/StyleCursorImage.h
Expand Up @@ -34,6 +34,8 @@ class Document;
class WeakPtrImplWithEventTargetData;
class SVGCursorElement;

enum class LoadedFromOpaqueSource : uint8_t;

class StyleCursorImage final : public StyleMultiImage {
WTF_MAKE_FAST_ALLOCATED;
public:
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/rendering/style/StyleGeneratedImage.cpp
Expand Up @@ -24,6 +24,7 @@
#include "config.h"
#include "StyleGeneratedImage.h"

#include "GeneratedImage.h"
#include "RenderElement.h"
#include "StyleResolver.h"

Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/style/FilterOperationsBuilder.cpp
Expand Up @@ -31,6 +31,7 @@
#include "CSSToLengthConversionData.h"
#include "ColorFromPrimitiveValue.h"
#include "Document.h"
#include "RenderStyle.h"
#include "TransformFunctions.h"

namespace WebCore {
Expand Down
3 changes: 3 additions & 0 deletions Source/WebCore/style/FilterOperationsBuilder.h
Expand Up @@ -25,6 +25,9 @@

#pragma once

#include "FilterOperations.h"
#include <optional>

namespace WebCore {

class CSSToLengthConversionData;
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/svg/SVGComponentTransferFunctionElement.cpp
Expand Up @@ -22,6 +22,7 @@
#include "config.h"
#include "SVGComponentTransferFunctionElement.h"

#include "SVGComponentTransferFunctionElementInlines.h"
#include "SVGFEComponentTransferElement.h"
#include "SVGNames.h"
#include <wtf/IsoMallocInlines.h>
Expand Down
2 changes: 2 additions & 0 deletions Source/WebDriver/socket/SessionHostSocket.cpp
Expand Up @@ -25,6 +25,8 @@

#include "config.h"
#include "SessionHost.h"

#include <wtf/NeverDestroyed.h>
#include <wtf/UUID.h>

namespace WebDriver {
Expand Down
Expand Up @@ -28,6 +28,7 @@

#include "ImageBufferShareableBitmapBackend.h"
#include "ShareablePixelBuffer.h"
#include <WebCore/GraphicsContext.h>
#include <WebCore/ImageBuffer.h>

#if ENABLE(GPU_PROCESS)
Expand Down
Expand Up @@ -27,6 +27,7 @@

#if ENABLE(GPU_PROCESS)

#include "SharedMemory.h"
#include <WebCore/ImageBufferAllocator.h>
#include <WebCore/ProcessIdentity.h>

Expand Down
2 changes: 2 additions & 0 deletions Source/WebKit/GPUProcess/graphics/RemoteImageBuffer.h
Expand Up @@ -27,6 +27,8 @@

#if ENABLE(GPU_PROCESS)

#include "QualifiedRenderingResourceIdentifier.h"
#include "RemoteRenderingBackend.h"
#include "ScopedActiveMessageReceiveQueue.h"
#include <WebCore/ImageBuffer.h>

Expand Down
4 changes: 4 additions & 0 deletions Source/WebKit/Platform/IPC/IPCUtilities.h
Expand Up @@ -27,6 +27,10 @@

#define ASSERT_IS_TESTING_IPC() ASSERT(IPC::isTestingIPC(), "Untrusted connection sent invalid data. Should only happen when testing IPC.")

#if OS(WINDOWS)
#include <windows.h>
#endif

namespace IPC {

// Function to check when asserting IPC-related failures, so that IPC testing skips the assertions
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/Shared/win/WebEventFactory.cpp
Expand Up @@ -36,6 +36,7 @@
#include <windowsx.h>
#include <wtf/ASCIICType.h>
#include <wtf/HexNumber.h>
#include <wtf/NeverDestroyed.h>

namespace WebKit {

Expand Down
Expand Up @@ -29,6 +29,7 @@
#if ENABLE(GPU_PROCESS)

#include "ArgumentCoders.h"
#include "RemoteImageBufferProxy.h"
#include "RemoteRenderingBackendProxy.h"

namespace WebKit {
Expand Down
Expand Up @@ -26,6 +26,7 @@
#pragma once

#include <WebCore/MessagePortChannelProvider.h>
#include <WebCore/MessageWithMessagePorts.h>

namespace WebKit {

Expand Down

0 comments on commit f4c8911

Please sign in to comment.