Updates to macos and tests for previous changes.upstream/jrex-custom-layer-style-changed-leak-3

1 files changed, 0 insertions, 8 deletions

diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index 8b9a5a982f..4cbf2b9fba 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -15,7 +15,6 @@
 #import "MGLMultiPoint_Private.h"
 #import "MGLOfflineStorage_Private.h"
 #import "MGLStyle_Private.h"
-#import "MGLStyleLayerRetentionManager_Private.h"
 #import "MGLShape_Private.h"
 
 #import "MGLAccountManager.h"
@@ -145,7 +144,6 @@ public:
 @property (nonatomic, readwrite) NSView *attributionView;
 
 @property (nonatomic, readwrite) MGLStyle *style;
-@property (nonatomic) MGLStyleLayerRetentionManager* styleLayerRetentionManager;
 
 /// Mapping from reusable identifiers to annotation images.
 @property (nonatomic) NS_MUTABLE_DICTIONARY_OF(NSString *, MGLAnnotationImage *) *annotationImagesByIdentifier;
@@ -258,8 +256,6 @@ public:
 - (void)commonInit {
     _isTargetingInterfaceBuilder = NSProcessInfo.processInfo.mgl_isInterfaceBuilderDesignablesAgent;
 
-    _styleLayerRetentionManager = [[MGLStyleLayerRetentionManager alloc] init];
-
     // Set up cross-platform controllers and resources.
     _mbglView = new MGLMapViewImpl(self);
 
@@ -886,8 +882,6 @@ public:
         return;
     }
 
-    [self.styleLayerRetentionManager updateRetainedLayers:self.style.managedLayers];
-
     if ([self.delegate respondsToSelector:@selector(mapViewWillStartRenderingFrame:)]) {
         [self.delegate mapViewWillStartRenderingFrame:self];
     }
@@ -903,8 +897,6 @@ public:
         [self.style didChangeValueForKey:@"layers"];
     }
 
-    [self.styleLayerRetentionManager decrementLifetimes];
-
     if ([self.delegate respondsToSelector:@selector(mapViewDidFinishRenderingFrame:fullyRendered:)]) {
         [self.delegate mapViewDidFinishRenderingFrame:self fullyRendered:fullyRendered];
     }