Title: [261131] trunk/Source/WebCore
- Revision
- 261131
- Author
- [email protected]
- Date
- 2020-05-04 17:36:26 -0700 (Mon, 04 May 2020)
Log Message
Unreviewed, reverting r261102.
https://bugs.webkit.org/show_bug.cgi?id=211418
Revert some debug logging (Requested by smfr on #webkit).
Reverted changeset:
"REGRESSION: [ Mac WK1 ] inspector/console/console-api.html is
flaky crashing"
https://bugs.webkit.org/show_bug.cgi?id=211386
https://trac.webkit.org/changeset/261102
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (261130 => 261131)
--- trunk/Source/WebCore/ChangeLog 2020-05-05 00:31:07 UTC (rev 261130)
+++ trunk/Source/WebCore/ChangeLog 2020-05-05 00:36:26 UTC (rev 261131)
@@ -1,3 +1,17 @@
+2020-05-04 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r261102.
+ https://bugs.webkit.org/show_bug.cgi?id=211418
+
+ Revert some debug logging (Requested by smfr on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION: [ Mac WK1 ] inspector/console/console-api.html is
+ flaky crashing"
+ https://bugs.webkit.org/show_bug.cgi?id=211386
+ https://trac.webkit.org/changeset/261102
+
2020-05-04 Chris Dumez <[email protected]>
Drop code path using the legacy CFNetwork cookie change notification SPI
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (261130 => 261131)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2020-05-05 00:31:07 UTC (rev 261130)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2020-05-05 00:36:26 UTC (rev 261131)
@@ -730,23 +730,6 @@
return makeUnique<ScrollAnimatorMac>(scrollableArea);
}
-#define INVESTIGATE_211386 1
-
-#if INVESTIGATE_211386
-static HashSet<NSScrollerImp *> paintersWithDelegates()
-{
- static NeverDestroyed<HashSet<NSScrollerImp *>> painterSet;
- return painterSet;
-}
-
-static void dumpPaintersWithDelegates(const char* msg)
-{
- WTFLogAlways("%s: %u NSScrollerImp with delegates", msg, paintersWithDelegates().size());
- for (auto* painter : paintersWithDelegates())
- WTFLogAlways(" painter %p", painter);
-}
-#endif
-
ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea& scrollableArea)
: ScrollAnimator(scrollableArea)
, m_initialScrollbarPaintTimer(*this, &ScrollAnimatorMac::initialScrollbarPaintTimerFired)
@@ -761,10 +744,6 @@
m_scrollerImpPair = adoptNS([[NSScrollerImpPair alloc] init]);
[m_scrollerImpPair setDelegate:m_scrollerImpPairDelegate.get()];
[m_scrollerImpPair setScrollerStyle:ScrollerStyle::recommendedScrollerStyle()];
-
-#if INVESTIGATE_211386
- dumpPaintersWithDelegates("ScrollAnimatorMac ctor: ");
-#endif
}
ScrollAnimatorMac::~ScrollAnimatorMac()
@@ -776,10 +755,6 @@
[m_verticalScrollerImpDelegate invalidate];
[m_scrollAnimationHelperDelegate invalidate];
END_BLOCK_OBJC_EXCEPTIONS;
-
-#if INVESTIGATE_211386
- dumpPaintersWithDelegates("ScrollAnimatorMac dtor: ");
-#endif
}
static bool scrollAnimationEnabledForSystem()
@@ -1135,10 +1110,6 @@
m_verticalScrollerImpDelegate = adoptNS([[WebScrollerImpDelegate alloc] initWithScrollbar:scrollbar]);
[painter setDelegate:m_verticalScrollerImpDelegate.get()];
-#if INVESTIGATE_211386
- paintersWithDelegates().add(painter);
-#endif
-
if (GraphicsLayer* layer = scrollbar->scrollableArea().layerForVerticalScrollbar())
[painter setLayer:layer->platformLayer()];
@@ -1158,10 +1129,6 @@
m_verticalScrollerImpDelegate = nullptr;
[painter setDelegate:nil];
-#if INVESTIGATE_211386
- paintersWithDelegates().remove(painter);
-#endif
-
[m_scrollerImpPair setVerticalScrollerImp:nil];
}
@@ -1175,10 +1142,6 @@
m_horizontalScrollerImpDelegate = adoptNS([[WebScrollerImpDelegate alloc] initWithScrollbar:scrollbar]);
[painter setDelegate:m_horizontalScrollerImpDelegate.get()];
-#if INVESTIGATE_211386
- paintersWithDelegates().add(painter);
-#endif
-
if (GraphicsLayer* layer = scrollbar->scrollableArea().layerForHorizontalScrollbar())
[painter setLayer:layer->platformLayer()];
@@ -1198,10 +1161,6 @@
m_horizontalScrollerImpDelegate = nullptr;
[painter setDelegate:nil];
-#if INVESTIGATE_211386
- paintersWithDelegates().remove(painter);
-#endif
-
[m_scrollerImpPair setHorizontalScrollerImp:nil];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
