Title: [261306] trunk/Source/WebCore
Revision
261306
Author
[email protected]
Date
2020-05-07 10:45:43 -0700 (Thu, 07 May 2020)

Log Message

REGRESSION (r261056): [ Mac WK1 ] inspector/console/console-api.html is flaky crashing
https://bugs.webkit.org/show_bug.cgi?id=211386

Reviewed by Darin Adler.

Address additional review feedback.

* platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::unregisterScrollbar):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (261305 => 261306)


--- trunk/Source/WebCore/ChangeLog	2020-05-07 17:37:58 UTC (rev 261305)
+++ trunk/Source/WebCore/ChangeLog	2020-05-07 17:45:43 UTC (rev 261306)
@@ -1,3 +1,15 @@
+2020-05-07  Simon Fraser  <[email protected]>
+
+        REGRESSION (r261056): [ Mac WK1 ] inspector/console/console-api.html is flaky crashing
+        https://bugs.webkit.org/show_bug.cgi?id=211386
+
+        Reviewed by Darin Adler.
+
+        Address additional review feedback.
+
+        * platform/mac/ScrollbarThemeMac.mm:
+        (WebCore::ScrollbarThemeMac::unregisterScrollbar):
+
 2020-05-07  Zalan Bujtas  <[email protected]>
 
         [LFC[TFC] Adjust the table wrapper box style

Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (261305 => 261306)


--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm	2020-05-07 17:37:58 UTC (rev 261305)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm	2020-05-07 17:45:43 UTC (rev 261306)
@@ -180,11 +180,7 @@
 
 void ScrollbarThemeMac::unregisterScrollbar(Scrollbar& scrollbar)
 {
-    auto iter = scrollbarMap().find(&scrollbar);
-    if (iter != scrollbarMap().end()) {
-        [iter->value setDelegate:nil];
-        scrollbarMap().remove(iter);
-    }
+    [scrollbarMap().take(&scrollbar) setDelegate:nil];
 }
 
 void ScrollbarThemeMac::setNewPainterForScrollbar(Scrollbar& scrollbar, RetainPtr<NSScrollerImp>&& newPainter)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to