Title: [228707] branches/safari-605-branch/Source/WebKitLegacy/mac
Revision
228707
Author
jmarc...@apple.com
Date
2018-02-19 12:56:41 -0800 (Mon, 19 Feb 2018)

Log Message

Cherry-pick r228580. rdar://problem/37675341

Modified Paths

Diff

Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog (228706 => 228707)


--- branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog	2018-02-19 20:56:38 UTC (rev 228706)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/ChangeLog	2018-02-19 20:56:41 UTC (rev 228707)
@@ -1,3 +1,21 @@
+2018-02-19  Jason Marcell  <jmarc...@apple.com>
+
+        Cherry-pick r228580. rdar://problem/37675341
+
+    2018-02-16  Brent Fulgham  <bfulg...@apple.com>
+
+            [Cocoa][WebKitLegacy] REGRESSION(r221559): Coda 2 crashes when switching views
+            https://bugs.webkit.org/show_bug.cgi?id=182882
+            <rdar://problem/35672661>
+
+            Reviewed by Dan Bernstein.
+
+            Make sure the smart pointer hold the collection of subviews lives at least as
+            long as the loop using it.
+
+            * WebView/WebHTMLView.mm:
+            (-[WebHTMLView _web_makePluginSubviewsPerformSelector:withObject:]):
+
 2018-02-04  Jason Marcell  <jmarc...@apple.com>
 
         Apply patch. rdar://problem/36547114

Modified: branches/safari-605-branch/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (228706 => 228707)


--- branches/safari-605-branch/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	2018-02-19 20:56:38 UTC (rev 228706)
+++ branches/safari-605-branch/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	2018-02-19 20:56:41 UTC (rev 228707)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2018 Apple Inc. All rights reserved.
  *           (C) 2006, 2007 Graham Dennis (graham.den...@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1427,7 +1427,8 @@
 {
     // Copy subviews because [self subviews] returns the view's mutable internal array,
     // and we must avoid mutating the array while enumerating it.
-    for (NSView *view in adoptNS([[self subviews] copy]).get()) {
+    auto subviewsCopy = adoptNS([self.subviews copy]);
+    for (NSView *view in subviewsCopy.get()) {
         if ([view isKindOfClass:[WebBaseNetscapePluginView class]])
             [view performSelector:selector withObject:object];
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to