Changeset 275527 in webkit


Ignore:
Timestamp:
Apr 6, 2021 9:51:57 AM (3 years ago)
Author:
commit-queue@webkit.org
Message:

Non-unified build fixes, early April 2021
​https://bugs.webkit.org/show_bug.cgi?id=224091

Patch by Tyler Wilcock <Tyler Wilcock> on 2021-04-06
Reviewed by Simon Fraser.
Source/WebCore:

The SelectionRestorationMode enum has been moved out of Document.h so
the entirety of Document.h doesn't need to be included just for that
enum.

  • Headers.cmake:

Add SelectionRestorationMode.h.

  • WebCore.xcodeproj/project.pbxproj:

Add SelectionRestorationMode.h.

  • dom/Document.h:

Move SelectionRestorationMode enum to its own file.

  • dom/Element.h:

Add forward declaration for enum class SelectionRestorationMode. Rearrange
existing enum class forward declarations alphabetically.

  • dom/SelectionRestorationMode.h: Added.
  • dom/FocusOptions.h:
  • history/CachedPage.cpp:
  • html/HTMLFormControlElement.cpp:
  • html/HTMLInputElement.h:
  • html/HTMLLabelElement.cpp:
  • html/HTMLLegendElement.cpp:
  • html/HTMLTextAreaElement.h:
  • html/InputType.cpp:
  • page/EventHandler.cpp:
  • page/FocusController.cpp:

Add #include "SelectionRestorationMode.h".

  • workers/service/context/ServiceWorkerThreadProxy.cpp:

Add #include "ServiceWorkerGlobalScope.h" to fix:
ServiceWorkerThreadProxy.cpp:287:53: error: invalid use of incomplete type
'WTF::match_constness_t<WebCore::ScriptExecutionContext, WebCore::ServiceWorkerGlobalScope>'
{aka 'class WebCore::ServiceWorkerGlobalScope'}

Source/WebKit:

The SelectionRestorationMode enum has been moved out of Document.h so
the entirety of Document.h doesn't need to be included just for that
enum.

  • WebProcess/WebPage/WebPage.cpp:

Add #include "SelectionRestorationMode.h".

Location:
trunk/Source
Files:
18 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r275523 r275527  
     12021-04-06  Tyler Wilcock  <twilco.o@protonmail.com>
     2
     3        Non-unified build fixes, early April 2021
     4        https://bugs.webkit.org/show_bug.cgi?id=224091
     5
     6        Reviewed by Simon Fraser.
     7       
     8        The SelectionRestorationMode enum has been moved out of Document.h so
     9        the entirety of Document.h doesn't need to be included just for that
     10        enum.
     11
     12        * Headers.cmake:
     13        Add SelectionRestorationMode.h.
     14
     15        * WebCore.xcodeproj/project.pbxproj:
     16        Add SelectionRestorationMode.h.
     17       
     18        * dom/Document.h:
     19        Move SelectionRestorationMode enum to its own file.
     20
     21        * dom/Element.h:
     22        Add forward declaration for enum class SelectionRestorationMode. Rearrange
     23        existing enum class forward declarations alphabetically.
     24
     25        * dom/SelectionRestorationMode.h: Added.
     26
     27        * dom/FocusOptions.h:
     28        * history/CachedPage.cpp:
     29        * html/HTMLFormControlElement.cpp:
     30        * html/HTMLInputElement.h:
     31        * html/HTMLLabelElement.cpp:
     32        * html/HTMLLegendElement.cpp:
     33        * html/HTMLTextAreaElement.h:
     34        * html/InputType.cpp:
     35        * page/EventHandler.cpp:
     36        * page/FocusController.cpp:
     37        Add #include "SelectionRestorationMode.h".
     38
     39        * workers/service/context/ServiceWorkerThreadProxy.cpp:
     40        Add #include "ServiceWorkerGlobalScope.h" to fix:
     41        ServiceWorkerThreadProxy.cpp:287:53: error: invalid use of incomplete type
     42        'WTF::match_constness_t<WebCore::ScriptExecutionContext, WebCore::ServiceWorkerGlobalScope>'
     43        {aka 'class WebCore::ServiceWorkerGlobalScope'}
     44
    1452021-04-06  Aditya Keerthi  <akeerthi@apple.com>
    246

  • trunk/Source/WebCore/Headers.cmake

    r275459 r275527  
    513513    dom/SecurityContext.h
    514514    dom/SecurityPolicyViolationEvent.h
     515    dom/SelectionRestorationMode.h
    515516    dom/ShadowRoot.h
    516517    dom/ShadowRootInit.h

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r275484 r275527  
    30833083                984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 984264EF12D5280A000D88A4 /* LinkLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    30843084                985BB96E13A94058007A0B69 /* LinkRelAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 985BB96C13A94058007A0B69 /* LinkRelAttribute.h */; settings = {ATTRIBUTES = (Private, ); }; };
     3085                98CBC8052618F68C001593C8 /* SelectionRestorationMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 98CBC8032618F68B001593C8 /* SelectionRestorationMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
    30853086                98CE432A129E00E5005821DC /* LinkLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 98CE4329129E00E5005821DC /* LinkLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
    30863087                98EB1F951313FE0500D0E1EA /* NotImplemented.h in Headers */ = {isa = PBXBuildFile; fileRef = 98EB1F941313FE0500D0E1EA /* NotImplemented.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1210712108                985BB96B13A94058007A0B69 /* LinkRelAttribute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinkRelAttribute.cpp; sourceTree = "<group>"; };
    1210812109                985BB96C13A94058007A0B69 /* LinkRelAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkRelAttribute.h; sourceTree = "<group>"; };
     12110                98CBC8032618F68B001593C8 /* SelectionRestorationMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionRestorationMode.h; sourceTree = "<group>"; };
    1210912111                98CE4325129E00BD005821DC /* LinkLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinkLoader.cpp; sourceTree = "<group>"; };
    1211012112                98CE4329129E00E5005821DC /* LinkLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkLoader.h; sourceTree = "<group>"; };
    … …  
    3061530617                                2D5BC42516F882BE007048D0 /* SecurityPolicyViolationEvent.h */,
    3061630618                                2D5BC42616F882BE007048D0 /* SecurityPolicyViolationEvent.idl */,
     30619                                98CBC8032618F68B001593C8 /* SelectionRestorationMode.h */,
    3061730620                                E45322A9140CE267005A0F92 /* SelectorQuery.cpp */,
    3061830621                                E45322AA140CE267005A0F92 /* SelectorQuery.h */,
    … …  
    3489634899                                BEA807C90F714A0300524199 /* SelectionRect.h in Headers */,
    3489734900                                51405C89190B014400754F94 /* SelectionRectGatherer.h in Headers */,
     34901                                98CBC8052618F68C001593C8 /* SelectionRestorationMode.h in Headers */,
    3489834902                                E44B4BB4141650D7002B1D8B /* SelectorChecker.h in Headers */,
    3489934903                                432D3FE818A8658400D7DC03 /* SelectorCheckerTestFunctions.h in Headers */,

  • trunk/Source/WebCore/dom/Document.h

    r275420 r275527  
    292292enum DimensionsCheck { WidthDimensionsCheck = 1 << 0, HeightDimensionsCheck = 1 << 1, AllDimensionsCheck = 1 << 2 };
    293293
    294 enum class SelectionRestorationMode : uint8_t {
    295     RestoreOrSelectAll,
    296     SelectAll,
    297     PlaceCaretAtStart,
    298 };
    299 
    300294enum class HttpEquivPolicy {
    301295    Enabled,

  • trunk/Source/WebCore/dom/Element.h

    r274832 r275527  
    6464class WebAnimation;
    6565
     66enum class AnimationImpact;
     67enum class EventProcessing : uint8_t;
     68enum class SelectionRestorationMode : uint8_t;
     69
    6670struct GetAnimationsOptions;
    6771struct KeyframeAnimationOptions;
    … …  
    6973struct ScrollToOptions;
    7074
    71 enum class EventProcessing : uint8_t;
    72 
    7375#if ENABLE(INTERSECTION_OBSERVER)
    7476struct IntersectionObserverData;
    … …  
    8284struct ElementStyle;
    8385}
    84 
    85 enum class AnimationImpact;
    8686
    8787class Element : public ContainerNode {

  • trunk/Source/WebCore/dom/FocusOptions.h

    r275422 r275527  
    2626#pragma once
    2727
    28 #include "Document.h"
    2928#include "FocusDirection.h"
     29#include "SelectionRestorationMode.h"
    3030
    3131namespace WebCore {

  • trunk/Source/WebCore/dom/SelectionRestorationMode.h

    r275526 r275527  
    11/*
    2  * Copyright (C) 2020 Igalia S.L. All rights reserved.
     2 * Copyright (C) 2021 Tyler Wilcock <twilco.o@protonmail.com>.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2626#pragma once
    2727
    28 #include "Document.h"
    29 #include "FocusDirection.h"
    30 
    3128namespace WebCore {
    3229
    33 struct FocusOptions {
    34     SelectionRestorationMode selectionRestorationMode { SelectionRestorationMode::RestoreOrSelectAll };
    35     FocusDirection direction { FocusDirection::None };
    36     bool preventScroll { false };
     30enum class SelectionRestorationMode : uint8_t {
     31    RestoreOrSelectAll,
     32    SelectAll,
     33    PlaceCaretAtStart,
    3734};
    3835
    3936} // namespace WebCore
     37

  • trunk/Source/WebCore/history/CachedPage.cpp

    r269587 r275527  
    4040#include "PageTransitionEvent.h"
    4141#include "ScriptDisallowedScope.h"
     42#include "SelectionRestorationMode.h"
    4243#include "Settings.h"
    4344#include "VisitedLinkState.h"

  • trunk/Source/WebCore/html/HTMLFormControlElement.cpp

    r275161 r275527  
    4545#include "RenderTheme.h"
    4646#include "ScriptDisallowedScope.h"
     47#include "SelectionRestorationMode.h"
    4748#include "Settings.h"
    4849#include "StyleTreeResolver.h"

  • trunk/Source/WebCore/html/HTMLInputElement.h

    r273049 r275527  
    2727#include "FileChooser.h"
    2828#include "HTMLTextFormControlElement.h"
     29#include "SelectionRestorationMode.h"
    2930#include <memory>
    3031#include <wtf/WeakPtr.h>

  • trunk/Source/WebCore/html/HTMLLabelElement.cpp

    r274812 r275527  
    3333#include "HTMLFormControlElement.h"
    3434#include "HTMLNames.h"
     35#include "SelectionRestorationMode.h"
    3536#include <wtf/IsoMallocInlines.h>
    3637

  • trunk/Source/WebCore/html/HTMLLegendElement.cpp

    r274812 r275527  
    2929#include "HTMLFieldSetElement.h"
    3030#include "HTMLNames.h"
     31#include "SelectionRestorationMode.h"
    3132#include <wtf/IsoMallocInlines.h>
    3233

  • trunk/Source/WebCore/html/HTMLTextAreaElement.h

    r266026 r275527  
    2525
    2626#include "HTMLTextFormControlElement.h"
     27#include "SelectionRestorationMode.h"
    2728
    2829namespace WebCore {

  • trunk/Source/WebCore/html/InputType.cpp

    r274812 r275527  
    6565#include "ScopedEventQueue.h"
    6666#include "SearchInputType.h"
     67#include "SelectionRestorationMode.h"
    6768#include "Settings.h"
    6869#include "ShadowRoot.h"

  • trunk/Source/WebCore/page/EventHandler.cpp

    r275072 r275527  
    9393#include "ScrollLatchingController.h"
    9494#include "Scrollbar.h"
     95#include "SelectionRestorationMode.h"
    9596#include "Settings.h"
    9697#include "ShadowRoot.h"

  • trunk/Source/WebCore/page/FocusController.cpp

    r274812 r275527  
    5757#include "RenderWidget.h"
    5858#include "ScrollAnimator.h"
     59#include "SelectionRestorationMode.h"
    5960#include "Settings.h"
    6061#include "ShadowRoot.h"

  • trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp

    r275443 r275527  
    4343#include "ServiceWorkerClientData.h"
    4444#include "ServiceWorkerClientIdentifier.h"
     45#include "ServiceWorkerGlobalScope.h"
    4546#include "Settings.h"
    4647#include "WorkerGlobalScope.h"

  • trunk/Source/WebKit/ChangeLog

    r275525 r275527  
     12021-04-06  Tyler Wilcock  <twilco.o@protonmail.com>
     2
     3        Non-unified build fixes, early April 2021
     4        https://bugs.webkit.org/show_bug.cgi?id=224091
     5
     6        Reviewed by Simon Fraser.
     7
     8        The SelectionRestorationMode enum has been moved out of Document.h so
     9        the entirety of Document.h doesn't need to be included just for that
     10        enum.
     11
     12        * WebProcess/WebPage/WebPage.cpp:
     13        Add #include "SelectionRestorationMode.h".
     14
    1152021-04-06  Youenn Fablet  <youenn@apple.com>
    216

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r275486 r275527  
    235235#include <WebCore/ScriptController.h>
    236236#include <WebCore/SecurityPolicy.h>
     237#include <WebCore/SelectionRestorationMode.h>
    237238#include <WebCore/SerializedScriptValue.h>
    238239#include <WebCore/Settings.h>
Note: See TracChangeset for help on using the changeset viewer.