Title: [282628] trunk
Revision
282628
Author
[email protected]
Date
2021-09-16 19:29:15 -0700 (Thu, 16 Sep 2021)

Log Message

Fixes for build-webkit --minimal
https://bugs.webkit.org/show_bug.cgi?id=229780

Patch by Philip Chimento <[email protected]> on 2021-09-16
Reviewed by Fujii Hironori.

.:

Remove ENABLE_RESIZE_OBSERVER build-time option. This option is
quite broken if you try to disable it.

* Source/cmake/OptionsFTW.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:

Source/WebCore:

Covered by existing tests.

Remove ENABLE_RESIZE_OBSERVER build-time option. This option is quite
broken if you try to disable it.

* dom/Document.cpp:
* dom/Document.h:
* dom/Element.cpp:
(WebCore::Element::~Element):
* dom/Element.h:
* dom/ElementRareData.cpp:
* dom/ElementRareData.h:
(WebCore::ElementRareData::setResizeObserverData):
(WebCore::ElementRareData::useTypes const):
* page/Page.cpp:
(WebCore::Page::updateRendering):
(WebCore::operator<<):
* page/Page.h:
* page/ResizeObservation.cpp:
* page/ResizeObservation.h:
* page/ResizeObserver.cpp:
* page/ResizeObserver.h:
* page/ResizeObserver.idl:
* page/ResizeObserverCallback.h:
* page/ResizeObserverCallback.idl:
* page/ResizeObserverEntry.h:
* page/ResizeObserverEntry.idl:
* testing/Internals.cpp:
(WebCore::Internals::numberOfResizeObservers const):
* testing/Internals.h:
* testing/Internals.idl:

Source/WTF:

Remove ENABLE_RESIZE_OBSERVER build-time option. This option is
quite broken if you try to disable it.

* Scripts/Preferences/WebPreferencesExperimental.yaml:
* wtf/PlatformEnableCocoa.h:

Tools:

Remove ENABLE_RESIZE_OBSERVER build-time option. This option is
quite broken if you try to disable it.

* Scripts/webkitperl/FeatureList.pm:

Modified Paths

Diff

Modified: trunk/ChangeLog (282627 => 282628)


--- trunk/ChangeLog	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/ChangeLog	2021-09-17 02:29:15 UTC (rev 282628)
@@ -1,3 +1,17 @@
+2021-09-16  Philip Chimento  <[email protected]>
+
+        Fixes for build-webkit --minimal
+        https://bugs.webkit.org/show_bug.cgi?id=229780
+
+        Reviewed by Fujii Hironori.
+
+        Remove ENABLE_RESIZE_OBSERVER build-time option. This option is
+        quite broken if you try to disable it.
+
+        * Source/cmake/OptionsFTW.cmake:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+
 2021-09-15  Philip Chimento  <[email protected]>
 
         Fixes for build-webkit --minimal

Modified: trunk/Source/WTF/ChangeLog (282627 => 282628)


--- trunk/Source/WTF/ChangeLog	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WTF/ChangeLog	2021-09-17 02:29:15 UTC (rev 282628)
@@ -1,3 +1,16 @@
+2021-09-16  Philip Chimento  <[email protected]>
+
+        Fixes for build-webkit --minimal
+        https://bugs.webkit.org/show_bug.cgi?id=229780
+
+        Reviewed by Fujii Hironori.
+
+        Remove ENABLE_RESIZE_OBSERVER build-time option. This option is
+        quite broken if you try to disable it.
+
+        * Scripts/Preferences/WebPreferencesExperimental.yaml:
+        * wtf/PlatformEnableCocoa.h:
+
 2021-09-16  Tim Horton  <[email protected]>
 
         Adjust ARKIT_INLINE_PREVIEW* compile time flags

Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml (282627 => 282628)


--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml	2021-09-17 02:29:15 UTC (rev 282628)
@@ -1039,7 +1039,6 @@
   type: bool
   humanReadableName: "Resize Observer"
   humanReadableDescription: "Enable Resize Observer support"
-  condition: ENABLE(RESIZE_OBSERVER)
   defaultValue:
     WebKitLegacy:
       default: false

Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (282627 => 282628)


--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -478,10 +478,6 @@
 #define ENABLE_REMOTE_INSPECTOR 1
 #endif
 
-#if !defined(ENABLE_RESIZE_OBSERVER)
-#define ENABLE_RESIZE_OBSERVER 1
-#endif
-
 #if !defined(ENABLE_INTELLIGENT_TRACKING_PREVENTION)
 #define ENABLE_INTELLIGENT_TRACKING_PREVENTION 1
 #endif

Modified: trunk/Source/WebCore/ChangeLog (282627 => 282628)


--- trunk/Source/WebCore/ChangeLog	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/ChangeLog	2021-09-17 02:29:15 UTC (rev 282628)
@@ -1,3 +1,42 @@
+2021-09-16  Philip Chimento  <[email protected]>
+
+        Fixes for build-webkit --minimal
+        https://bugs.webkit.org/show_bug.cgi?id=229780
+
+        Reviewed by Fujii Hironori.
+
+        Covered by existing tests.
+
+        Remove ENABLE_RESIZE_OBSERVER build-time option. This option is quite
+        broken if you try to disable it.
+
+        * dom/Document.cpp:
+        * dom/Document.h:
+        * dom/Element.cpp:
+        (WebCore::Element::~Element):
+        * dom/Element.h:
+        * dom/ElementRareData.cpp:
+        * dom/ElementRareData.h:
+        (WebCore::ElementRareData::setResizeObserverData):
+        (WebCore::ElementRareData::useTypes const):
+        * page/Page.cpp:
+        (WebCore::Page::updateRendering):
+        (WebCore::operator<<):
+        * page/Page.h:
+        * page/ResizeObservation.cpp:
+        * page/ResizeObservation.h:
+        * page/ResizeObserver.cpp:
+        * page/ResizeObserver.h:
+        * page/ResizeObserver.idl:
+        * page/ResizeObserverCallback.h:
+        * page/ResizeObserverCallback.idl:
+        * page/ResizeObserverEntry.h:
+        * page/ResizeObserverEntry.idl:
+        * testing/Internals.cpp:
+        (WebCore::Internals::numberOfResizeObservers const):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2021-09-16  Cameron McCormack  <[email protected]>
 
         Support drawImage with a wide gamut image painting into a display-p3 canvas

Modified: trunk/Source/WebCore/dom/Document.cpp (282627 => 282628)


--- trunk/Source/WebCore/dom/Document.cpp	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/dom/Document.cpp	2021-09-17 02:29:15 UTC (rev 282628)
@@ -8074,8 +8074,6 @@
     return *m_intersectionObserverData;
 }
 
-#if ENABLE(RESIZE_OBSERVER)
-
 void Document::addResizeObserver(ResizeObserver& observer)
 {
     if (!m_resizeObservers.contains(&observer))
@@ -8156,8 +8154,6 @@
     }
 }
 
-#endif
-
 const AtomString& Document::dir() const
 {
     auto* documentElement = this->documentElement();

Modified: trunk/Source/WebCore/dom/Document.h (282627 => 282628)


--- trunk/Source/WebCore/dom/Document.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/dom/Document.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -1436,7 +1436,6 @@
     IntersectionObserverData& ensureIntersectionObserverData();
     IntersectionObserverData* intersectionObserverDataIfExists() { return m_intersectionObserverData.get(); }
 
-#if ENABLE(RESIZE_OBSERVER)
     void addResizeObserver(ResizeObserver&);
     void removeResizeObserver(ResizeObserver&);
     unsigned numberOfResizeObservers() const { return m_resizeObservers.size(); }
@@ -1447,7 +1446,6 @@
     bool hasSkippedResizeObservations() const;
     void setHasSkippedResizeObservations(bool);
     void updateResizeObservations(Page&);
-#endif
 
 #if ENABLE(MEDIA_STREAM)
     void setHasCaptureMediaStreamTrack() { m_hasHadCaptureMediaStreamTrack = true; }
@@ -1936,9 +1934,7 @@
     // This is only non-null when this document is an explicit root.
     std::unique_ptr<IntersectionObserverData> m_intersectionObserverData;
 
-#if ENABLE(RESIZE_OBSERVER)
     Vector<WeakPtr<ResizeObserver>> m_resizeObservers;
-#endif
 
     Timer m_loadEventDelayTimer;
 

Modified: trunk/Source/WebCore/dom/Element.cpp (282627 => 282628)


--- trunk/Source/WebCore/dom/Element.cpp	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/dom/Element.cpp	2021-09-17 02:29:15 UTC (rev 282628)
@@ -208,9 +208,7 @@
 
     disconnectFromIntersectionObservers();
 
-#if ENABLE(RESIZE_OBSERVER)
     disconnectFromResizeObservers();
-#endif
 
     removeShadowRoot();
 
@@ -4019,8 +4017,6 @@
         ensureAnimationRareData(pseudoId).setLastStyleChangeEventStyle(WTFMove(style));
 }
 
-#if ENABLE(RESIZE_OBSERVER)
-
 void Element::disconnectFromResizeObservers()
 {
     auto* observerData = resizeObserverData();
@@ -4045,8 +4041,6 @@
     return hasRareData() ? elementRareData()->resizeObserverData() : nullptr;
 }
 
-#endif
-
 bool Element::isSpellCheckingEnabled() const
 {
     for (auto* ancestor = this; ancestor; ancestor = ancestor->parentOrShadowHostElement()) {

Modified: trunk/Source/WebCore/dom/Element.h (282627 => 282628)


--- trunk/Source/WebCore/dom/Element.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/dom/Element.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -71,13 +71,10 @@
 struct GetAnimationsOptions;
 struct IntersectionObserverData;
 struct KeyframeAnimationOptions;
+struct ResizeObserverData;
 struct ScrollIntoViewOptions;
 struct ScrollToOptions;
 
-#if ENABLE(RESIZE_OBSERVER)
-struct ResizeObserverData;
-#endif
-
 namespace Style {
 struct ElementStyle;
 }
@@ -614,10 +611,8 @@
     IntersectionObserverData& ensureIntersectionObserverData();
     IntersectionObserverData* intersectionObserverDataIfExists();
 
-#if ENABLE(RESIZE_OBSERVER)
     ResizeObserverData& ensureResizeObserverData();
     ResizeObserverData* resizeObserverData();
-#endif
 
     Element* findAnchorElementForLink(String& outAnchorName);
 
@@ -704,9 +699,7 @@
 
     void disconnectFromIntersectionObservers();
 
-#if ENABLE(RESIZE_OBSERVER)
     void disconnectFromResizeObservers();
-#endif
 
     // The cloneNode function is private so that non-virtual cloneElementWith/WithoutChildren are used instead.
     Ref<Node> cloneNodeInternal(Document&, CloningOperation) override;

Modified: trunk/Source/WebCore/dom/ElementRareData.cpp (282627 => 282628)


--- trunk/Source/WebCore/dom/ElementRareData.cpp	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/dom/ElementRareData.cpp	2021-09-17 02:29:15 UTC (rev 282628)
@@ -42,10 +42,7 @@
 #if ENABLE(CSS_TYPED_OM)
     void* typedOMData;
 #endif
-#if ENABLE(RESIZE_OBSERVER)
     void* resizeObserverData;
-#endif
-
 };
 
 static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");

Modified: trunk/Source/WebCore/dom/ElementRareData.h (282627 => 282628)


--- trunk/Source/WebCore/dom/ElementRareData.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/dom/ElementRareData.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -100,10 +100,8 @@
     IntersectionObserverData* intersectionObserverData() { return m_intersectionObserverData.get(); }
     void setIntersectionObserverData(std::unique_ptr<IntersectionObserverData>&& data) { m_intersectionObserverData = WTFMove(data); }
 
-#if ENABLE(RESIZE_OBSERVER)
     ResizeObserverData* resizeObserverData() { return m_resizeObserverData.get(); }
     void setResizeObserverData(std::unique_ptr<ResizeObserverData>&& data) { m_resizeObserverData = WTFMove(data); }
-#endif
 
 #if ENABLE(CSS_TYPED_OM)
     StylePropertyMap* attributeStyleMap() { return m_attributeStyleMap.get(); }
@@ -134,10 +132,8 @@
             result.add(UseType::AttributeMap);
         if (m_intersectionObserverData)
             result.add(UseType::InteractionObserver);
-#if ENABLE(RESIZE_OBSERVER)
         if (m_resizeObserverData)
             result.add(UseType::ResizeObserver);
-#endif
         if (!m_animationRareData.isEmpty())
             result.add(UseType::Animations);
         if (m_beforePseudoElement || m_afterPseudoElement)
@@ -167,9 +163,7 @@
 
     std::unique_ptr<IntersectionObserverData> m_intersectionObserverData;
 
-#if ENABLE(RESIZE_OBSERVER)
     std::unique_ptr<ResizeObserverData> m_resizeObserverData;
-#endif
 
     Vector<std::unique_ptr<ElementAnimationRareData>> m_animationRareData;
 

Modified: trunk/Source/WebCore/page/Page.cpp (282627 => 282628)


--- trunk/Source/WebCore/page/Page.cpp	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/Page.cpp	2021-09-17 02:29:15 UTC (rev 282628)
@@ -1588,11 +1588,9 @@
         document.updateIntersectionObservations();
     });
 
-#if ENABLE(RESIZE_OBSERVER)
     runProcessingStep(RenderingUpdateStep::ResizeObservations, [&] (Document& document) {
         document.updateResizeObservations(*this);
     });
-#endif
 
     runProcessingStep(RenderingUpdateStep::Images, [] (Document& document) {
         for (auto& image : document.cachedResourceLoader().allCachedSVGImages()) {
@@ -3611,9 +3609,7 @@
     case RenderingUpdateStep::Fullscreen: ts << "Fullscreen"; break;
     case RenderingUpdateStep::AnimationFrameCallbacks: ts << "AnimationFrameCallbacks"; break;
     case RenderingUpdateStep::IntersectionObservations: ts << "IntersectionObservations"; break;
-#if ENABLE(RESIZE_OBSERVER)
     case RenderingUpdateStep::ResizeObservations: ts << "ResizeObservations"; break;
-#endif
     case RenderingUpdateStep::Images: ts << "Images"; break;
     case RenderingUpdateStep::WheelEventMonitorCallbacks: ts << "WheelEventMonitorCallbacks"; break;
     case RenderingUpdateStep::CursorUpdate: ts << "CursorUpdate"; break;

Modified: trunk/Source/WebCore/page/Page.h (282627 => 282628)


--- trunk/Source/WebCore/page/Page.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/Page.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -196,9 +196,7 @@
     Fullscreen                      = 1 << 4,
     AnimationFrameCallbacks         = 1 << 5,
     IntersectionObservations        = 1 << 6,
-#if ENABLE(RESIZE_OBSERVER)
     ResizeObservations              = 1 << 7,
-#endif
     Images                          = 1 << 8,
     WheelEventMonitorCallbacks      = 1 << 9,
     CursorUpdate                    = 1 << 10,
@@ -217,9 +215,7 @@
     RenderingUpdateStep::Fullscreen,
     RenderingUpdateStep::AnimationFrameCallbacks,
     RenderingUpdateStep::IntersectionObservations,
-#if ENABLE(RESIZE_OBSERVER)
     RenderingUpdateStep::ResizeObservations,
-#endif
     RenderingUpdateStep::Images,
     RenderingUpdateStep::WheelEventMonitorCallbacks,
     RenderingUpdateStep::CursorUpdate,

Modified: trunk/Source/WebCore/page/ResizeObservation.cpp (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObservation.cpp	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObservation.cpp	2021-09-17 02:29:15 UTC (rev 282628)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if ENABLE(RESIZE_OBSERVER)
-
 #include "ResizeObservation.h"
 
 #include "HTMLFrameOwnerElement.h"
@@ -133,5 +131,3 @@
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(RESIZE_OBSERVER)

Modified: trunk/Source/WebCore/page/ResizeObservation.h (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObservation.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObservation.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if ENABLE(RESIZE_OBSERVER)
-
 #include "FloatRect.h"
 #include "LayoutSize.h"
 #include "ResizeObserverBoxOptions.h"
@@ -75,5 +73,3 @@
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(RESIZE_OBSERVER)

Modified: trunk/Source/WebCore/page/ResizeObserver.cpp (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserver.cpp	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserver.cpp	2021-09-17 02:29:15 UTC (rev 282628)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#if ENABLE(RESIZE_OBSERVER)
 #include "ResizeObserver.h"
 
 #include "Element.h"
@@ -189,5 +188,3 @@
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(RESIZE_OBSERVER)

Modified: trunk/Source/WebCore/page/ResizeObserver.h (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserver.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserver.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if ENABLE(RESIZE_OBSERVER)
-
 #include "GCReachableRef.h"
 #include "ResizeObservation.h"
 #include "ResizeObserverCallback.h"
@@ -90,5 +88,3 @@
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(RESIZE_OBSERVER)

Modified: trunk/Source/WebCore/page/ResizeObserver.idl (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserver.idl	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserver.idl	2021-09-17 02:29:15 UTC (rev 282628)
@@ -26,7 +26,6 @@
 // https://wicg.github.io/ResizeObserver/
 
 [
-    Conditional=RESIZE_OBSERVER,
     EnabledBySetting=ResizeObserver,
     Exposed=Window,
     JSCustomMarkFunction,

Modified: trunk/Source/WebCore/page/ResizeObserverBoxOptions.h (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserverBoxOptions.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserverBoxOptions.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -28,8 +28,6 @@
 
 #pragma once
 
-#if ENABLE(RESIZE_OBSERVER)
-
 namespace WebCore {
 
 enum class ResizeObserverBoxOptions : uint8_t {
@@ -38,5 +36,3 @@
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(RESIZE_OBSERVER)

Modified: trunk/Source/WebCore/page/ResizeObserverCallback.h (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserverCallback.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserverCallback.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if ENABLE(RESIZE_OBSERVER)
-
 #include "ActiveDOMCallback.h"
 #include "CallbackResult.h"
 #include <wtf/RefCounted.h>
@@ -46,5 +44,3 @@
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(RESIZE_OBSERVER)

Modified: trunk/Source/WebCore/page/ResizeObserverCallback.idl (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserverCallback.idl	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserverCallback.idl	2021-09-17 02:29:15 UTC (rev 282628)
@@ -25,7 +25,6 @@
 
 // https://drafts.csswg.org/resize-observer/#resize-observer-callback
 [
-    Conditional=RESIZE_OBSERVER,
     CallbackThisObject=ResizeObserver,
     IsWeakCallback,
 ] callback ResizeObserverCallback = undefined (sequence<ResizeObserverEntry> entries, ResizeObserver observer);

Modified: trunk/Source/WebCore/page/ResizeObserverEntry.h (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserverEntry.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserverEntry.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if ENABLE(RESIZE_OBSERVER)
-
 #include "DOMRectReadOnly.h"
 #include "Element.h"
 #include "FloatRect.h"
@@ -69,4 +67,3 @@
 };
 
 } // namespace WebCore
-#endif // ENABLE(RESIZE_OBSERVER)

Modified: trunk/Source/WebCore/page/ResizeObserverEntry.idl (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserverEntry.idl	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserverEntry.idl	2021-09-17 02:29:15 UTC (rev 282628)
@@ -25,7 +25,6 @@
 
 // https://drafts.csswg.org/resize-observer/#resize-observer-entry-interface
 [
-    Conditional=RESIZE_OBSERVER,
     ImplementationLacksVTable,
     EnabledBySetting=ResizeObserver,
     JSCustomMarkFunction,

Modified: trunk/Source/WebCore/page/ResizeObserverOptions.h (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserverOptions.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserverOptions.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -28,8 +28,6 @@
 
 #pragma once
 
-#if ENABLE(RESIZE_OBSERVER)
-
 #include "ResizeObserverBoxOptions.h"
 
 namespace WebCore {
@@ -39,5 +37,3 @@
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(RESIZE_OBSERVER)

Modified: trunk/Source/WebCore/page/ResizeObserverOptions.idl (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserverOptions.idl	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserverOptions.idl	2021-09-17 02:29:15 UTC (rev 282628)
@@ -24,8 +24,6 @@
  */
 
 // https://drafts.csswg.org/resize-observer/#dictdef-resizeobserveroptions
-[
-    Conditional=RESIZE_OBSERVER,
-] dictionary ResizeObserverOptions {
+dictionary ResizeObserverOptions {
     ResizeObserverBoxOptions box = "content-box";
 };

Modified: trunk/Source/WebCore/page/ResizeObserverSize.h (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserverSize.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserverSize.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -28,8 +28,6 @@
 
 #pragma once
 
-#if ENABLE(RESIZE_OBSERVER)
-
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
@@ -58,5 +56,3 @@
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(RESIZE_OBSERVER)

Modified: trunk/Source/WebCore/page/ResizeObserverSize.idl (282627 => 282628)


--- trunk/Source/WebCore/page/ResizeObserverSize.idl	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/page/ResizeObserverSize.idl	2021-09-17 02:29:15 UTC (rev 282628)
@@ -25,8 +25,7 @@
 
 // https://drafts.csswg.org/resize-observer/#resizeobserversize
 [
-    Exposed=Window,
-    Conditional=RESIZE_OBSERVER
+    Exposed=Window
 ] interface ResizeObserverSize {
     readonly attribute unrestricted double inlineSize;
     readonly attribute unrestricted double blockSize;

Modified: trunk/Source/WebCore/testing/Internals.cpp (282627 => 282628)


--- trunk/Source/WebCore/testing/Internals.cpp	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/testing/Internals.cpp	2021-09-17 02:29:15 UTC (rev 282628)
@@ -2701,12 +2701,10 @@
     return document.numberOfIntersectionObservers();
 }
 
-#if ENABLE(RESIZE_OBSERVER)
 unsigned Internals::numberOfResizeObservers(const Document& document) const
 {
     return document.numberOfResizeObservers();
 }
-#endif
 
 uint64_t Internals::documentIdentifier(const Document& document) const
 {

Modified: trunk/Source/WebCore/testing/Internals.h (282627 => 282628)


--- trunk/Source/WebCore/testing/Internals.h	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/testing/Internals.h	2021-09-17 02:29:15 UTC (rev 282628)
@@ -476,9 +476,7 @@
 
     unsigned numberOfIntersectionObservers(const Document&) const;
 
-#if ENABLE(RESIZE_OBSERVER)
     unsigned numberOfResizeObservers(const Document&) const;
-#endif
 
     uint64_t documentIdentifier(const Document&) const;
     bool isDocumentAlive(uint64_t documentIdentifier) const;

Modified: trunk/Source/WebCore/testing/Internals.idl (282627 => 282628)


--- trunk/Source/WebCore/testing/Internals.idl	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/WebCore/testing/Internals.idl	2021-09-17 02:29:15 UTC (rev 282628)
@@ -571,7 +571,7 @@
     unsigned long numberOfLiveDocuments();
     unsigned long referencingNodeCount(Document document);
     unsigned long numberOfIntersectionObservers(Document document);
-    [Conditional = RESIZE_OBSERVER] unsigned long numberOfResizeObservers(Document document);
+    unsigned long numberOfResizeObservers(Document document);
     WindowProxy? openDummyInspectorFrontend(DOMString url);
     undefined closeDummyInspectorFrontend();
     undefined setInspectorIsUnderTest(boolean isUnderTest);

Modified: trunk/Source/cmake/OptionsFTW.cmake (282627 => 282628)


--- trunk/Source/cmake/OptionsFTW.cmake	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/cmake/OptionsFTW.cmake	2021-09-17 02:29:15 UTC (rev 282628)
@@ -91,7 +91,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ORIENTATION_EVENTS PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESIZE_OBSERVER PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SAMPLING_PROFILER PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE OFF)

Modified: trunk/Source/cmake/OptionsMac.cmake (282627 => 282628)


--- trunk/Source/cmake/OptionsMac.cmake	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/cmake/OptionsMac.cmake	2021-09-17 02:29:15 UTC (rev 282628)
@@ -71,7 +71,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESIZE_OBSERVER PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RUBBER_BANDING PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS PRIVATE ON)

Modified: trunk/Source/cmake/WebKitFeatures.cmake (282627 => 282628)


--- trunk/Source/cmake/WebKitFeatures.cmake	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Source/cmake/WebKitFeatures.cmake	2021-09-17 02:29:15 UTC (rev 282628)
@@ -196,7 +196,6 @@
     WEBKIT_OPTION_DEFINE(ENABLE_POINTER_LOCK "Toggle pointer lock support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_PUBLIC_SUFFIX_LIST "Toggle public suffix list support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_REMOTE_INSPECTOR "Toggle remote inspector support" PRIVATE ON)
-    WEBKIT_OPTION_DEFINE(ENABLE_RESIZE_OBSERVER "Toggle Resize Observer support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_USAGE "Toggle resource usage support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_RUBBER_BANDING "Toggle rubber banding support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE ${ENABLE_SAMPLING_PROFILER_DEFAULT})

Modified: trunk/Tools/ChangeLog (282627 => 282628)


--- trunk/Tools/ChangeLog	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Tools/ChangeLog	2021-09-17 02:29:15 UTC (rev 282628)
@@ -1,3 +1,15 @@
+2021-09-16  Philip Chimento  <[email protected]>
+
+        Fixes for build-webkit --minimal
+        https://bugs.webkit.org/show_bug.cgi?id=229780
+
+        Reviewed by Fujii Hironori.
+
+        Remove ENABLE_RESIZE_OBSERVER build-time option. This option is
+        quite broken if you try to disable it.
+
+        * Scripts/webkitperl/FeatureList.pm:
+
 2021-09-16  Jonathan Bedard  <[email protected]>
 
         Exception in run-webkit-tests: Bad file descriptor (Part 4)

Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (282627 => 282628)


--- trunk/Tools/Scripts/webkitperl/FeatureList.pm	2021-09-17 01:59:06 UTC (rev 282627)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm	2021-09-17 02:29:15 UTC (rev 282628)
@@ -138,7 +138,6 @@
     $publicSuffixListSupport,
     $quotaSupport,
     $remoteInspectorSupport,
-    $resizeObserverSupport,
     $resolutionMediaQuerySupport,
     $resourceUsageSupport,
     $rubberBandingSupport,
@@ -441,9 +440,6 @@
     { option => "remote-inspector", desc => "Toggle remote inspector support",
       define => "ENABLE_REMOTE_INSPECTOR", value => \$remoteInspectorSupport },
 
-    { option => "resize-observer", desc => "Toggle Resize Observer support",
-      define => "ENABLE_RESIZE_OBSERVER", value => \$resizeObserverSupport },
-
     { option => "resolution-media-query", desc => "Toggle resolution media query support",
       define => "ENABLE_RESOLUTION_MEDIA_QUERY", value => \$resolutionMediaQuerySupport },
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to