Changeset 267143 in webkit


Ignore:
Timestamp:
Sep 16, 2020 8:09:28 AM (4 years ago)
Author:
Adrian Perez de Castro
Message:

Non-unified build fixes, early September 2020 edition
https://bugs.webkit.org/show_bug.cgi?id=216599

Unreviewed build fix.

Largely based on a patch by Lauro Moura <Lauro Moura>

Source/JavaScriptCore:

  • runtime/IntlCache.cpp: Add missing wtf/Vector.h include.
  • runtime/IntlCache.h: Add missing wtf/text/CString.h include.
  • runtime/IntlNumberFormatPrototype.cpp: Replace IntlNumberFormat.h

include with IntlNumberFormatInlines.h to fix linking.

Source/WebCore:

  • Modules/async-clipboard/ClipboardImageReader.cpp: Add missing Document.h include.
  • Modules/async-clipboard/ClipboardImageReader.h: Add missing forward declaration

for Document.

  • Modules/fetch/FetchBodyConsumer.cpp: Add missing includes for DOMFormData.h,

HTTPParsers.h, and JSDOMFormData.h.

  • css/parser/CSSSelectorParser.cpp: Move CSSSelectorParser declaration to header.
  • css/parser/CSSSelectorParser.h: Ditto.
  • css/parser/CSSSupportsParser.cpp: Add missing CSSSelectorParser.h include.
  • dom/DataTransferItemList.cpp: Add missing includes for ContextDestructionObserver.h

and Document.h.

  • html/HTMLMetaElement.cpp: Add missing includes for Settings.h and

wtf/IsoMallocInlines.h.

  • html/canvas/EXTBlendMinMax.cpp: Add missing wtf/IsoMallocInlines.h include.
  • html/canvas/EXTColorBufferFloat.cpp: Ditto.
  • html/canvas/OESElementIndexUint.cpp: Ditto.
  • html/canvas/WebGLCompressedTextureASTC.cpp: Ditto.
  • html/canvas/WebGLCompressedTextureATC.cpp: Ditto.
  • html/canvas/WebGLCompressedTextureETC.cpp: Ditto.
  • inspector/InspectorFrontendHost.cpp: Add missing Settings.h include.
  • layout/display/DisplayLayerController.cpp: Add missing LayoutState.h include.
  • layout/displaytree/DisplayPainter.h: Add missing LayoutBox.h include.
  • layout/inlineformatting/InlineLineBox.cpp: Add missing InlineFormattingContext.h

include.

  • platform/audio/FFTFrame.cpp: Add missing VectorMath.h include.
  • platform/audio/SincResampler.h: Add missing wtf/Optional.h include.
  • rendering/SimpleLineLayout.h: Add missing RenderStyleConstants.h include.

Source/WebKit:

  • GPUProcess/media/RemoteCDMProxy.cpp: Add missing WebCore/SharedBuffer.h include.
  • GPUProcess/media/RemoteMediaResourceLoader.cpp: Add missing WebCore/ResourceError.h

include.

  • NetworkProcess/webrtc/NetworkRTCProvider.cpp: Add missing DataReference.h include.
  • UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp:

(WebKit::WebDataListSuggestionsDropdownGtk::show): Add missing namespace to
WebCore::monitorWorkArea() call.

  • WebProcess/Network/WebSocketChannelManager.cpp: Add missing

WebCore/WebSocketIdentifier.h include.
(WebKit::WebSocketChannelManager::didReceiveMessage): Add missing namespace to
WebCore::WebSocketIdentifierType usage.

Location:
trunk/Source
Files:
32 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r267135 r267143  
     12020-09-16  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        Non-unified build fixes, early September 2020 edition
     4        https://bugs.webkit.org/show_bug.cgi?id=216599
     5
     6        Unreviewed build fix.
     7
     8        Largely based on a patch by Lauro Moura <lmoura@igalia.com>
     9
     10        * runtime/IntlCache.cpp: Add missing wtf/Vector.h include.
     11        * runtime/IntlCache.h: Add missing wtf/text/CString.h include.
     12        * runtime/IntlNumberFormatPrototype.cpp: Replace IntlNumberFormat.h
     13        include with IntlNumberFormatInlines.h to fix linking.
     14
    1152020-09-15  Saam Barati  <sbarati@apple.com>
    216
  • trunk/Source/JavaScriptCore/runtime/IntlCache.cpp

    r267132 r267143  
    2727#include "IntlCache.h"
    2828
     29#include <wtf/Vector.h>
     30
    2931namespace JSC {
    3032
  • trunk/Source/JavaScriptCore/runtime/IntlCache.h

    r267132 r267143  
    2828#include <unicode/udatpg.h>
    2929#include <wtf/Noncopyable.h>
     30#include <wtf/text/CString.h>
    3031#include <wtf/unicode/icu/ICUHelpers.h>
    3132
  • trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp

    r266679 r267143  
    2929
    3030#include "BuiltinNames.h"
    31 #include "IntlNumberFormat.h"
     31#include "IntlNumberFormatInlines.h"
    3232#include "JSBoundFunction.h"
    3333#include "JSCInlines.h"
  • trunk/Source/WebCore/ChangeLog

    r267142 r267143  
     12020-09-16  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        Non-unified build fixes, early September 2020 edition
     4        https://bugs.webkit.org/show_bug.cgi?id=216599
     5
     6        Unreviewed build fix.
     7
     8        Largely based on a patch by Lauro Moura <lmoura@igalia.com>
     9
     10        * Modules/async-clipboard/ClipboardImageReader.cpp: Add missing Document.h include.
     11        * Modules/async-clipboard/ClipboardImageReader.h: Add missing forward declaration
     12        for Document.
     13        * Modules/fetch/FetchBodyConsumer.cpp: Add missing includes for DOMFormData.h,
     14        HTTPParsers.h, and JSDOMFormData.h.
     15        * css/parser/CSSSelectorParser.cpp: Move CSSSelectorParser declaration to header.
     16        * css/parser/CSSSelectorParser.h: Ditto.
     17        * css/parser/CSSSupportsParser.cpp: Add missing CSSSelectorParser.h include.
     18        * dom/DataTransferItemList.cpp: Add missing includes for ContextDestructionObserver.h
     19        and Document.h.
     20        * html/HTMLMetaElement.cpp: Add missing includes for Settings.h and
     21        wtf/IsoMallocInlines.h.
     22        * html/canvas/EXTBlendMinMax.cpp: Add missing wtf/IsoMallocInlines.h include.
     23        * html/canvas/EXTColorBufferFloat.cpp: Ditto.
     24        * html/canvas/OESElementIndexUint.cpp: Ditto.
     25        * html/canvas/WebGLCompressedTextureASTC.cpp: Ditto.
     26        * html/canvas/WebGLCompressedTextureATC.cpp: Ditto.
     27        * html/canvas/WebGLCompressedTextureETC.cpp: Ditto.
     28        * inspector/InspectorFrontendHost.cpp: Add missing Settings.h include.
     29        * layout/display/DisplayLayerController.cpp: Add missing LayoutState.h include.
     30        * layout/displaytree/DisplayPainter.h: Add missing LayoutBox.h include.
     31        * layout/inlineformatting/InlineLineBox.cpp: Add missing InlineFormattingContext.h
     32        include.
     33        * platform/audio/FFTFrame.cpp: Add missing VectorMath.h include.
     34        * platform/audio/SincResampler.h: Add missing wtf/Optional.h include.
     35        * rendering/SimpleLineLayout.h: Add missing RenderStyleConstants.h include.
     36
    1372020-09-16  Zalan Bujtas  <zalan@apple.com>
    238
  • trunk/Source/WebCore/Modules/async-clipboard/ClipboardImageReader.cpp

    r262209 r267143  
    2727#include "ClipboardImageReader.h"
    2828
     29#include "Document.h"
    2930#include "NotImplemented.h"
    3031
  • trunk/Source/WebCore/Modules/async-clipboard/ClipboardImageReader.h

    r266168 r267143  
    3131namespace WebCore {
    3232
     33class Document;
    3334class SharedBuffer;
    3435
  • trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp

    r266168 r267143  
    3030#include "FetchBodyConsumer.h"
    3131
     32#include "DOMFormData.h"
    3233#include "HTTPHeaderField.h"
     34#include "HTTPParsers.h"
    3335#include "JSBlob.h"
     36#include "JSDOMFormData.h"
    3437#include "ReadableStreamChunk.h"
    3538#include "TextResourceDecoder.h"
  • trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp

    r266253 r267143  
    3131#include "CSSSelectorParser.h"
    3232
    33 #include "CSSParserContext.h"
    34 #include "CSSParserSelector.h"
    35 #include "CSSParserTokenRange.h"
    36 #include "CSSSelectorList.h"
    37 #include "StyleSheetContents.h"
    3833#include <memory>
    3934#include <wtf/OptionSet.h>
    4035
    4136namespace WebCore {
    42 
    43 class CSSSelectorParser {
    44 public:
    45     CSSSelectorParser(const CSSParserContext&, StyleSheetContents*);
    46 
    47     CSSSelectorList consumeComplexSelectorList(CSSParserTokenRange&);
    48 
    49     static bool supportsComplexSelector(CSSParserTokenRange, const CSSParserContext&);
    50 
    51 private:
    52     CSSSelectorList consumeCompoundSelectorList(CSSParserTokenRange&);
    53 
    54     std::unique_ptr<CSSParserSelector> consumeComplexSelector(CSSParserTokenRange&);
    55     std::unique_ptr<CSSParserSelector> consumeCompoundSelector(CSSParserTokenRange&);
    56 
    57     // This doesn't include element names, since they're handled specially.
    58     std::unique_ptr<CSSParserSelector> consumeSimpleSelector(CSSParserTokenRange&);
    59 
    60     bool consumeName(CSSParserTokenRange&, AtomString& name, AtomString& namespacePrefix);
    61 
    62     // These will return nullptr when the selector is invalid.
    63     std::unique_ptr<CSSParserSelector> consumeId(CSSParserTokenRange&);
    64     std::unique_ptr<CSSParserSelector> consumeClass(CSSParserTokenRange&);
    65     std::unique_ptr<CSSParserSelector> consumePseudo(CSSParserTokenRange&);
    66     std::unique_ptr<CSSParserSelector> consumeAttribute(CSSParserTokenRange&);
    67 
    68     CSSSelector::RelationType consumeCombinator(CSSParserTokenRange&);
    69     CSSSelector::Match consumeAttributeMatch(CSSParserTokenRange&);
    70     CSSSelector::AttributeMatchType consumeAttributeFlags(CSSParserTokenRange&);
    71 
    72     const AtomString& defaultNamespace() const;
    73     const AtomString& determineNamespace(const AtomString& prefix);
    74     void prependTypeSelectorIfNeeded(const AtomString& namespacePrefix, const AtomString& elementName, CSSParserSelector&);
    75     static std::unique_ptr<CSSParserSelector> splitCompoundAtImplicitShadowCrossingCombinator(std::unique_ptr<CSSParserSelector> compoundSelector, const CSSParserContext&);
    76     static bool containsUnknownWebKitPseudoElements(const CSSSelector& complexSelector);
    77 
    78     class DisallowPseudoElementsScope;
    79 
    80     const CSSParserContext& m_context;
    81     const RefPtr<StyleSheetContents> m_styleSheet;
    82     bool m_failedParsing { false };
    83     bool m_disallowPseudoElements { false };
    84 };
    8537
    8638class CSSSelectorParser::DisallowPseudoElementsScope {
  • trunk/Source/WebCore/css/parser/CSSSelectorParser.h

    r257748 r267143  
    3030#pragma once
    3131
     32#include "CSSParserContext.h"
     33#include "CSSParserSelector.h"
     34#include "CSSParserTokenRange.h"
     35#include "CSSSelectorList.h"
     36#include "StyleSheetContents.h"
     37
    3238namespace WebCore {
    3339
     
    3844struct CSSParserContext;
    3945
     46class CSSSelectorParser {
     47public:
     48    CSSSelectorParser(const CSSParserContext&, StyleSheetContents*);
     49
     50    CSSSelectorList consumeComplexSelectorList(CSSParserTokenRange&);
     51
     52    static bool supportsComplexSelector(CSSParserTokenRange, const CSSParserContext&);
     53
     54private:
     55    CSSSelectorList consumeCompoundSelectorList(CSSParserTokenRange&);
     56
     57    std::unique_ptr<CSSParserSelector> consumeComplexSelector(CSSParserTokenRange&);
     58    std::unique_ptr<CSSParserSelector> consumeCompoundSelector(CSSParserTokenRange&);
     59
     60    // This doesn't include element names, since they're handled specially.
     61    std::unique_ptr<CSSParserSelector> consumeSimpleSelector(CSSParserTokenRange&);
     62
     63    bool consumeName(CSSParserTokenRange&, AtomString& name, AtomString& namespacePrefix);
     64
     65    // These will return nullptr when the selector is invalid.
     66    std::unique_ptr<CSSParserSelector> consumeId(CSSParserTokenRange&);
     67    std::unique_ptr<CSSParserSelector> consumeClass(CSSParserTokenRange&);
     68    std::unique_ptr<CSSParserSelector> consumePseudo(CSSParserTokenRange&);
     69    std::unique_ptr<CSSParserSelector> consumeAttribute(CSSParserTokenRange&);
     70
     71    CSSSelector::RelationType consumeCombinator(CSSParserTokenRange&);
     72    CSSSelector::Match consumeAttributeMatch(CSSParserTokenRange&);
     73    CSSSelector::AttributeMatchType consumeAttributeFlags(CSSParserTokenRange&);
     74
     75    const AtomString& defaultNamespace() const;
     76    const AtomString& determineNamespace(const AtomString& prefix);
     77    void prependTypeSelectorIfNeeded(const AtomString& namespacePrefix, const AtomString& elementName, CSSParserSelector&);
     78    static std::unique_ptr<CSSParserSelector> splitCompoundAtImplicitShadowCrossingCombinator(std::unique_ptr<CSSParserSelector> compoundSelector, const CSSParserContext&);
     79    static bool containsUnknownWebKitPseudoElements(const CSSSelector& complexSelector);
     80
     81    class DisallowPseudoElementsScope;
     82
     83    const CSSParserContext& m_context;
     84    const RefPtr<StyleSheetContents> m_styleSheet;
     85    bool m_failedParsing { false };
     86    bool m_disallowPseudoElements { false };
     87};
     88
     89
     90
    4091CSSSelectorList parseCSSSelector(CSSParserTokenRange, const CSSParserContext&, StyleSheetContents*);
    4192
  • trunk/Source/WebCore/css/parser/CSSSupportsParser.cpp

    r266253 r267143  
    3232
    3333#include "CSSParserImpl.h"
     34#include "CSSSelectorParser.h"
    3435
    3536namespace WebCore {
  • trunk/Source/WebCore/dom/DataTransferItemList.cpp

    r266168 r267143  
    2727#include "DataTransferItemList.h"
    2828
     29#include "ContextDestructionObserver.h"
    2930#include "DataTransferItem.h"
     31#include "Document.h"
    3032#include "FileList.h"
    3133#include "Pasteboard.h"
  • trunk/Source/WebCore/html/HTMLMetaElement.cpp

    r266360 r267143  
    2828#include "HTMLHeadElement.h"
    2929#include "HTMLNames.h"
     30#include "Settings.h"
    3031#include <wtf/IsoMallocInlines.h>
    3132
  • trunk/Source/WebCore/html/canvas/EXTBlendMinMax.cpp

    r266809 r267143  
    2929#include "EXTBlendMinMax.h"
    3030
     31#include <wtf/IsoMallocInlines.h>
     32
    3133namespace WebCore {
    3234
  • trunk/Source/WebCore/html/canvas/EXTColorBufferFloat.cpp

    r266809 r267143  
    3030
    3131#include "ExtensionsGL.h"
     32#include <wtf/IsoMallocInlines.h>
    3233
    3334namespace WebCore {
  • trunk/Source/WebCore/html/canvas/OESElementIndexUint.cpp

    r266809 r267143  
    3030#include "OESElementIndexUint.h"
    3131
     32#include <wtf/IsoMallocInlines.h>
     33
    3234namespace WebCore {
    3335
  • trunk/Source/WebCore/html/canvas/WebGLCompressedTextureASTC.cpp

    r266809 r267143  
    3232#include "RuntimeEnabledFeatures.h"
    3333#include "WebGLRenderingContextBase.h"
     34#include <wtf/IsoMallocInlines.h>
    3435
    3536namespace WebCore {
  • trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.cpp

    r266809 r267143  
    3131
    3232#include "ExtensionsGL.h"
     33#include <wtf/IsoMallocInlines.h>
    3334
    3435namespace WebCore {
  • trunk/Source/WebCore/html/canvas/WebGLCompressedTextureETC.cpp

    r266809 r267143  
    3131#include "ExtensionsGL.h"
    3232#include "WebGLRenderingContextBase.h"
     33#include <wtf/IsoMallocInlines.h>
    3334
    3435namespace WebCore {
  • trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp

    r266885 r267143  
    5656#include "Pasteboard.h"
    5757#include "ScriptState.h"
     58#include "Settings.h"
    5859#include "UserGestureIndicator.h"
    5960#include <JavaScriptCore/ScriptFunctionCall.h>
  • trunk/Source/WebCore/layout/display/DisplayLayerController.cpp

    r267076 r267143  
    3737#include "LayoutBoxGeometry.h"
    3838#include "LayoutContext.h"
     39#include "LayoutState.h"
    3940#include "Logging.h"
    4041#include "Page.h"
  • trunk/Source/WebCore/layout/displaytree/DisplayPainter.h

    r267076 r267143  
    2828#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
    2929
     30#include "LayoutBox.h"
     31
    3032namespace WebCore {
    3133
  • trunk/Source/WebCore/layout/inlineformatting/InlineLineBox.cpp

    r267001 r267143  
    2727#include "InlineLineBox.h"
    2828
     29#include "InlineFormattingContext.h"
     30
    2931#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
    3032
  • trunk/Source/WebCore/platform/audio/FFTFrame.cpp

    r266492 r267143  
    3434
    3535#include "Logging.h"
     36#include "VectorMath.h"
    3637#include <complex>
    3738#include <wtf/MathExtras.h>
  • trunk/Source/WebCore/platform/audio/SincResampler.h

    r267014 r267143  
    3232#include "AudioArray.h"
    3333#include "AudioSourceProvider.h"
     34#include <wtf/Optional.h>
    3435#include <wtf/RefPtr.h>
    3536
  • trunk/Source/WebCore/rendering/SimpleLineLayout.h

    r266291 r267143  
    2626#pragma once
    2727
     28#include "RenderStyleConstants.h"
    2829#include "SimpleLineLayoutCoverage.h"
    2930#include "TextFlags.h"
  • trunk/Source/WebKit/ChangeLog

    r267137 r267143  
     12020-09-16  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        Non-unified build fixes, early September 2020 edition
     4        https://bugs.webkit.org/show_bug.cgi?id=216599
     5
     6        Unreviewed build fix.
     7
     8        Largely based on a patch by Lauro Moura <lmoura@igalia.com>
     9
     10        * GPUProcess/media/RemoteCDMProxy.cpp: Add missing WebCore/SharedBuffer.h include.
     11        * GPUProcess/media/RemoteMediaResourceLoader.cpp: Add missing WebCore/ResourceError.h
     12        include.
     13        * NetworkProcess/webrtc/NetworkRTCProvider.cpp: Add missing DataReference.h include.
     14        * UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp:
     15        (WebKit::WebDataListSuggestionsDropdownGtk::show): Add missing namespace to
     16        WebCore::monitorWorkArea() call.
     17        * WebProcess/Network/WebSocketChannelManager.cpp: Add missing
     18        WebCore/WebSocketIdentifier.h include.
     19        (WebKit::WebSocketChannelManager::didReceiveMessage): Add missing namespace to
     20        WebCore::WebSocketIdentifierType usage.
     21
    1222020-09-15  Said Abou-Hallawa  <sabouhallawa@apple.com>
    223
  • trunk/Source/WebKit/GPUProcess/media/RemoteCDMProxy.cpp

    r266003 r267143  
    3434#include <WebCore/CDMKeySystemConfiguration.h>
    3535#include <WebCore/CDMPrivate.h>
     36#include <WebCore/SharedBuffer.h>
    3637
    3738namespace WebKit {
  • trunk/Source/WebKit/GPUProcess/media/RemoteMediaResourceLoader.cpp

    r264021 r267143  
    3030
    3131#include "RemoteMediaPlayerProxy.h"
     32#include <WebCore/ResourceError.h>
    3233
    3334namespace WebKit {
  • trunk/Source/WebKit/NetworkProcess/webrtc/NetworkRTCProvider.cpp

    r264922 r267143  
    2929#if USE(LIBWEBRTC)
    3030
     31#include "DataReference.h"
    3132#include "LibWebRTCNetworkMessages.h"
    3233#include "LibWebRTCSocketClient.h"
  • trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp

    r266055 r267143  
    166166#endif
    167167    GdkRectangle area;
    168     monitorWorkArea(monitor, &area);
     168    WebCore::monitorWorkArea(monitor, &area);
    169169    int width = std::min(information.elementRect.width(), area.width);
    170170    size_t itemCount = std::min<size_t>(information.suggestions.size(), (area.height / 3) / itemHeight);
  • trunk/Source/WebKit/WebProcess/Network/WebSocketChannelManager.cpp

    r260063 r267143  
    2727#include "WebSocketChannelManager.h"
    2828
     29#include <WebCore/WebSocketIdentifier.h>
     30
    2931namespace WebKit {
    3032
     
    4446void WebSocketChannelManager::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
    4547{
    46     auto iterator = m_channels.find(makeObjectIdentifier<WebSocketIdentifierType>(decoder.destinationID()));
     48    auto iterator = m_channels.find(makeObjectIdentifier<WebCore::WebSocketIdentifierType>(decoder.destinationID()));
    4749    if (iterator != m_channels.end())
    4850        iterator->value->didReceiveMessage(connection, decoder);
Note: See TracChangeset for help on using the changeset viewer.