[webkit-changes] [260059] trunk/Source

Mon, 13 Apr 2020 22:33:04 -0700

Title: [260059] trunk/Source

Diff

Modified: trunk/Source/WTF/ChangeLog (260058 => 260059)


--- trunk/Source/WTF/ChangeLog	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WTF/ChangeLog	2020-04-14 05:32:11 UTC (rev 260059)
@@ -1,3 +1,18 @@
+2020-04-13  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, reverting r260052.
+        https://bugs.webkit.org/show_bug.cgi?id=210479
+
+        Breaks iOS tests, needs more work (Requested by smfr on
+        #webkit).
+
+        Reverted changeset:
+
+        "Add ENABLE_CUSTOM_SCROLLBARS and define it for macOS and for
+        non-Cocoa platforms"
+        https://bugs.webkit.org/show_bug.cgi?id=210460
+        https://trac.webkit.org/changeset/260052
+
 2020-04-13  David Kilzer  <ddkil...@apple.com>
 
         Replace use of Checked<size_t, RecordOverflow> with CheckedSize

Modified: trunk/Source/WTF/wtf/PlatformEnable.h (260058 => 260059)


--- trunk/Source/WTF/wtf/PlatformEnable.h	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WTF/wtf/PlatformEnable.h	2020-04-14 05:32:11 UTC (rev 260059)
@@ -835,10 +835,6 @@
 #endif
 #endif
 
-#if !defined(ENABLE_CUSTOM_SCROLLBARS)
-#define ENABLE_CUSTOM_SCROLLBARS 1
-#endif
-
 /* This feature works by embedding the OpcodeID in the 32 bit just before the generated LLint code
    that executes each opcode. It cannot be supported by the CLoop since there's no way to embed the
    OpcodeID word in the CLoop's switch statement cases. It is also currently not implemented for MSVC.

Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (260058 => 260059)


--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h	2020-04-14 05:32:11 UTC (rev 260059)
@@ -211,10 +211,6 @@
 #define ENABLE_ASYNC_SCROLLING 1
 #endif
 
-#if !defined(ENABLE_CUSTOM_SCROLLBARS) && PLATFORM(MAC)
-#define ENABLE_CUSTOM_SCROLLBARS 1
-#endif
-
 #if !defined(ENABLE_SCROLLING_THREAD) && PLATFORM(MAC)
 #define ENABLE_SCROLLING_THREAD 1
 #endif

Modified: trunk/Source/WebCore/ChangeLog (260058 => 260059)


--- trunk/Source/WebCore/ChangeLog	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/ChangeLog	2020-04-14 05:32:11 UTC (rev 260059)
@@ -1,3 +1,18 @@
+2020-04-13  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, reverting r260052.
+        https://bugs.webkit.org/show_bug.cgi?id=210479
+
+        Breaks iOS tests, needs more work (Requested by smfr on
+        #webkit).
+
+        Reverted changeset:
+
+        "Add ENABLE_CUSTOM_SCROLLBARS and define it for macOS and for
+        non-Cocoa platforms"
+        https://bugs.webkit.org/show_bug.cgi?id=210460
+        https://trac.webkit.org/changeset/260052
+
 2020-04-13  Adrian Perez de Castro  <ape...@igalia.com>
 
         [GTK4] Use ThemeAdwaita instead of ThemeGtk

Modified: trunk/Source/WebCore/page/FrameView.cpp (260058 => 260059)


--- trunk/Source/WebCore/page/FrameView.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/page/FrameView.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -554,7 +554,6 @@
 
 Ref<Scrollbar> FrameView::createScrollbar(ScrollbarOrientation orientation)
 {
-#if ENABLE(CUSTOM_SCROLLBARS)
     if (auto element = rootElementForCustomScrollbarPartStyle(PseudoId::Scrollbar))
         return RenderScrollbar::createCustomScrollbar(*this, orientation, element.get());
     
@@ -563,7 +562,6 @@
     RenderWidget* frameRenderer = frame().ownerRenderer();
     if (frameRenderer && frameRenderer->style().hasPseudoStyle(PseudoId::Scrollbar))
         return RenderScrollbar::createCustomScrollbar(*this, orientation, nullptr, &frame());
-#endif
 
     // Nobody set a custom style, so we just use a native scrollbar.
     return ScrollView::createScrollbar(orientation);
@@ -3951,7 +3949,6 @@
 
 void FrameView::updateScrollCorner()
 {
-#if ENABLE(CUSTOM_SCROLLBARS)
     RenderElement* renderer = nullptr;
     std::unique_ptr<RenderStyle> cornerStyle;
     IntRect cornerRect = scrollCornerRect();
@@ -3992,7 +3989,6 @@
             m_scrollCorner->setStyle(WTFMove(*cornerStyle));
         invalidateScrollCorner(cornerRect);
     }
-#endif
 }
 
 void FrameView::paintScrollCorner(GraphicsContext& context, const IntRect& cornerRect)

Modified: trunk/Source/WebCore/page/FrameView.h (260058 => 260059)


--- trunk/Source/WebCore/page/FrameView.h	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/page/FrameView.h	2020-04-14 05:32:11 UTC (rev 260059)
@@ -502,9 +502,7 @@
     WEBCORE_EXPORT FloatRect clientToLayoutViewportRect(FloatRect) const;
     WEBCORE_EXPORT FloatPoint clientToLayoutViewportPoint(FloatPoint) const;
 
-#if ENABLE(CUSTOM_SCROLLBARS)
     bool isFrameViewScrollCorner(const RenderScrollbarPart& scrollCorner) const { return m_scrollCorner.get() == &scrollCorner; }
-#endif
 
     // isScrollable() takes an optional Scrollability parameter that allows the caller to define what they mean by 'scrollable.'
     // Most callers are interested in the default value, Scrollability::Scrollable, which means that there is actually content
@@ -843,10 +841,8 @@
     RefPtr<ContainerNode> m_maintainScrollPositionAnchor;
     RefPtr<Node> m_nodeToDraw;
 
-#if ENABLE(CUSTOM_SCROLLBARS)
     // Renderer to hold our custom scroll corner.
     RenderPtr<RenderScrollbarPart> m_scrollCorner;
-#endif
 
     Timer m_updateEmbeddedObjectsTimer;
     Timer m_updateWidgetPositionsTimer;

Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderLayer.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -3489,14 +3489,11 @@
 {
     RefPtr<Scrollbar> widget;
     ASSERT(rendererForScrollbar(renderer()));
-#if ENABLE(CUSTOM_SCROLLBARS)
     auto& actualRenderer = *rendererForScrollbar(renderer());
     bool hasCustomScrollbarStyle = is<RenderBox>(actualRenderer) && downcast<RenderBox>(actualRenderer).style().hasPseudoStyle(PseudoId::Scrollbar);
     if (hasCustomScrollbarStyle)
         widget = RenderScrollbar::createCustomScrollbar(*this, orientation, downcast<RenderBox>(actualRenderer).element());
-    else
-#endif
-    {
+    else {
         widget = Scrollbar::createNativeScrollbar(*this, orientation, RegularScrollbar);
         didAddScrollbar(widget.get(), orientation);
         if (page().isMonitoringWheelEvents())
@@ -6814,7 +6811,6 @@
 
 void RenderLayer::updateScrollCornerStyle()
 {
-#if ENABLE(CUSTOM_SCROLLBARS)
     RenderElement* actualRenderer = rendererForScrollbar(renderer());
     auto corner = renderer().hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle({ PseudoId::ScrollbarCorner }, &actualRenderer->style()) : nullptr;
 
@@ -6830,23 +6826,18 @@
         m_scrollCorner->initializeStyle();
     } else
         m_scrollCorner->setStyle(WTFMove(*corner));
-#endif
 }
 
 void RenderLayer::clearScrollCorner()
 {
-#if ENABLE(CUSTOM_SCROLLBARS)
     if (!m_scrollCorner)
         return;
     m_scrollCorner->setParent(nullptr);
     m_scrollCorner = nullptr;
-#endif
-
 }
 
 void RenderLayer::updateResizerStyle()
 {
-#if ENABLE(CUSTOM_SCROLLBARS)
     RenderElement* actualRenderer = rendererForScrollbar(renderer());
     auto resizer = renderer().hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle({ PseudoId::Resizer }, &actualRenderer->style()) : nullptr;
 
@@ -6862,17 +6853,14 @@
         m_resizer->initializeStyle();
     } else
         m_resizer->setStyle(WTFMove(*resizer));
-#endif
 }
 
 void RenderLayer::clearResizer()
 {
-#if ENABLE(CUSTOM_SCROLLBARS)
     if (!m_resizer)
         return;
     m_resizer->setParent(nullptr);
     m_resizer = nullptr;
-#endif
 }
 
 RenderLayer* RenderLayer::reflectionLayer() const

Modified: trunk/Source/WebCore/rendering/RenderLayer.h (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderLayer.h	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderLayer.h	2020-04-14 05:32:11 UTC (rev 260059)
@@ -77,15 +77,12 @@
 class RenderLayerFilters;
 class RenderMarquee;
 class RenderReplica;
+class RenderScrollbarPart;
 class RenderStyle;
 class RenderView;
 class Scrollbar;
 class TransformationMatrix;
 
-#if ENABLE(CUSTOM_SCROLLBARS)
-class RenderScrollbarPart;
-#endif
-
 enum BorderRadiusClippingRule { IncludeSelfForBorderRadius, DoNotIncludeSelfForBorderRadius };
 enum IncludeSelfOrNot { IncludeSelf, ExcludeSelf };
 enum CrossFrameBoundaries { No, Yes };
@@ -1353,11 +1350,9 @@
     // May ultimately be extended to many replicas (with their own paint order).
     RenderPtr<RenderReplica> m_reflection;
 
-#if ENABLE(CUSTOM_SCROLLBARS)
     // Renderers to hold our custom scroll corner and resizer.
     RenderPtr<RenderScrollbarPart> m_scrollCorner;
     RenderPtr<RenderScrollbarPart> m_resizer;
-#endif
 
     // Pointer to the enclosing RenderLayer that caused us to be paginated. It is 0 if we are not paginated.
     WeakPtr<RenderLayer> m_enclosingPaginationLayer;

Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -76,6 +76,7 @@
 
 #if PLATFORM(IOS_FAMILY)
 #include "LegacyTileCache.h"
+#include "RenderScrollbar.h"
 #endif
 
 #if PLATFORM(MAC)

Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderListBox.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -918,13 +918,10 @@
 Ref<Scrollbar> RenderListBox::createScrollbar()
 {
     RefPtr<Scrollbar> widget;
-#if ENABLE(CUSTOM_SCROLLBARS)
     bool hasCustomScrollbarStyle = style().hasPseudoStyle(PseudoId::Scrollbar);
     if (hasCustomScrollbarStyle)
         widget = RenderScrollbar::createCustomScrollbar(*this, VerticalScrollbar, &selectElement());
-    else
-#endif
-    {
+    else {
         widget = Scrollbar::createNativeScrollbar(*this, VerticalScrollbar, theme().scrollbarControlSizeForPart(ListboxPart));
         didAddScrollbar(widget.get(), VerticalScrollbar);
         if (page().isMonitoringWheelEvents())

Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderMenuList.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -560,11 +560,9 @@
 
 Ref<Scrollbar> RenderMenuList::createScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize)
 {
-#if ENABLE(CUSTOM_SCROLLBARS)
     bool hasCustomScrollbarStyle = style().hasPseudoStyle(PseudoId::Scrollbar);
     if (hasCustomScrollbarStyle)
         return RenderScrollbar::createCustomScrollbar(scrollableArea, orientation, &selectElement());
-#endif
     return Scrollbar::createNativeScrollbar(scrollableArea, orientation, controlSize);
 }

Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderObject.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -632,13 +632,11 @@
     if (is<RenderText>(*this))
         return containingBlockForObjectInFlow();
 
-#if ENABLE(CUSTOM_SCROLLBARS)
     if (!parent() && is<RenderScrollbarPart>(*this)) {
         if (auto* scrollbarPart = downcast<RenderScrollbarPart>(*this).rendererOwningScrollbar())
             return containingBlockForRenderer(*scrollbarPart);
         return nullptr;
     }
-#endif
     return containingBlockForRenderer(downcast<RenderElement>(*this));
 }

Modified: trunk/Source/WebCore/rendering/RenderObject.h (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderObject.h	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderObject.h	2020-04-14 05:32:11 UTC (rev 260059)
@@ -265,9 +265,7 @@
     virtual bool isRenderMultiColumnFlow() const { return false; }
     virtual bool isRenderMultiColumnSpannerPlaceholder() const { return false; }
 
-#if ENABLE(CUSTOM_SCROLLBARS)
     virtual bool isRenderScrollbarPart() const { return false; }
-#endif
 
     bool isDocumentElementRenderer() const { return document().documentElement() == &m_node; }
     bool isBody() const { return node() && node()->hasTagName(HTMLNames::bodyTag); }

Modified: trunk/Source/WebCore/rendering/RenderScrollbar.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderScrollbar.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "RenderScrollbar.h"
 
-#if ENABLE(CUSTOM_SCROLLBARS)
-
 #include "Frame.h"
 #include "FrameView.h"
 #include "RenderScrollbarPart.h"
@@ -369,6 +367,3 @@
 }
 
 }
-
-#endif // ENABLE(CUSTOM_SCROLLBARS)
-

Modified: trunk/Source/WebCore/rendering/RenderScrollbar.h (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderScrollbar.h	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.h	2020-04-14 05:32:11 UTC (rev 260059)
@@ -30,8 +30,6 @@
 #include "Scrollbar.h"
 #include <wtf/HashMap.h>
 
-#if ENABLE(CUSTOM_SCROLLBARS)
-
 namespace WebCore {
 
 class Frame;
@@ -96,5 +94,3 @@
 SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::RenderScrollbar)
     static bool isType(const WebCore::Scrollbar& scrollbar) { return scrollbar.isCustomScrollbar(); }
 SPECIALIZE_TYPE_TRAITS_END()
-
-#endif // ENABLE(CUSTOM_SCROLLBARS)

Modified: trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "RenderScrollbarPart.h"
 
-#if ENABLE(CUSTOM_SCROLLBARS)
-
 #include "PaintInfo.h"
 #include "RenderScrollbar.h"
 #include "RenderScrollbarTheme.h"
@@ -203,4 +201,3 @@
 }
 
 }
-#endif // ENABLE(CUSTOM_SCROLLBARS)

Modified: trunk/Source/WebCore/rendering/RenderScrollbarPart.h (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderScrollbarPart.h	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderScrollbarPart.h	2020-04-14 05:32:11 UTC (rev 260059)
@@ -28,8 +28,6 @@
 #include "RenderBlock.h"
 #include "ScrollTypes.h"
 
-#if ENABLE(CUSTOM_SCROLLBARS)
-
 namespace WebCore {
 
 class RenderScrollbar;
@@ -78,5 +76,3 @@
 } // namespace WebCore
 
 SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderScrollbarPart, isRenderScrollbarPart())
-
-#endif // ENABLE(CUSTOM_SCROLLBARS)

Modified: trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderScrollbarTheme.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -25,9 +25,6 @@
 
 #include "config.h"
 #include "RenderScrollbarTheme.h"
-
-#if ENABLE(CUSTOM_SCROLLBARS)
-
 #include "RenderScrollbar.h"
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
@@ -165,5 +162,3 @@
 }
 
 }
-
-#endif // ENABLE(CUSTOM_SCROLLBARS)

Modified: trunk/Source/WebCore/rendering/RenderScrollbarTheme.h (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderScrollbarTheme.h	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderScrollbarTheme.h	2020-04-14 05:32:11 UTC (rev 260059)
@@ -27,8 +27,6 @@
 
 #include "ScrollbarThemeComposite.h"
 
-#if ENABLE(CUSTOM_SCROLLBARS)
-
 namespace WebCore {
 
 class PlatformMouseEvent;
@@ -83,5 +81,3 @@
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(CUSTOM_SCROLLBARS)

Modified: trunk/Source/WebCore/rendering/RenderSearchField.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderSearchField.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderSearchField.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -359,11 +359,9 @@
 
 Ref<Scrollbar> RenderSearchField::createScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize)
 {
-#if ENABLE(CUSTOM_SCROLLBARS)
     bool hasCustomScrollbarStyle = style().hasPseudoStyle(PseudoId::Scrollbar);
     if (hasCustomScrollbarStyle)
         return RenderScrollbar::createCustomScrollbar(scrollableArea, orientation, &inputElement());
-#endif
     return Scrollbar::createNativeScrollbar(scrollableArea, orientation, controlSize);
 }

Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (260058 => 260059)


--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -34,6 +34,7 @@
 #include "HitTestResult.h"
 #include "LocalizedStrings.h"
 #include "RenderLayer.h"
+#include "RenderScrollbar.h"
 #include "RenderTheme.h"
 #include "RenderView.h"
 #include "StyleResolver.h"

Modified: trunk/Source/WebCore/style/StyleResolver.cpp (260058 => 260059)


--- trunk/Source/WebCore/style/StyleResolver.cpp	2020-04-14 05:12:59 UTC (rev 260058)
+++ trunk/Source/WebCore/style/StyleResolver.cpp	2020-04-14 05:32:11 UTC (rev 260059)
@@ -52,6 +52,7 @@
 #include "NodeRenderStyle.h"
 #include "PageRuleCollector.h"
 #include "Pair.h"
+#include "RenderScrollbar.h"
 #include "RenderStyleConstants.h"
 #include "RenderView.h"
 #include "RuleSet.h"

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to