Revert e5ee29f.

Canonical link: https://commits.webkit.org/255891.12@safari-7615.1.11-branch
WebKit · Nov 4, 2022 · d314676 · d314676
1 parent 1d2a308
commit d314676
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.mm b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
@@ -333,10 +333,7 @@ - (void)startObserving:(NSWindow *)window
     if (_shouldObserveFontPanel)
         [self startObservingFontPanel];
 
-    [window addObserver:self forKeyPath:@"contentLayoutRect" options:NSKeyValueObservingOptionInitial context:keyValueObservingContext];
-    [window addObserver:self forKeyPath:@"titlebarAppearsTransparent" options:NSKeyValueObservingOptionInitial context:keyValueObservingContext];
-
-    _observedWindow = window;
+    [self _observeWindow:window];
 }
 
 - (void)stopObserving:(NSWindow *)window
@@ -367,12 +364,25 @@ - (void)stopObserving:(NSWindow *)window
     if (_shouldObserveFontPanel)
         [[NSFontPanel sharedFontPanel] removeObserver:self forKeyPath:@"visible" context:keyValueObservingContext];
 
-    if (_observedWindow == window) {
-        [window removeObserver:self forKeyPath:@"contentLayoutRect" context:keyValueObservingContext];
-        [window removeObserver:self forKeyPath:@"titlebarAppearsTransparent" context:keyValueObservingContext];
+    [self _observeWindow:nil];
+}
+
+- (void)_observeWindow:(NSWindow *)window
+{
+    if (_observedWindow == window)
+        return;
+
+    if (_observedWindow) {
+        [_observedWindow removeObserver:self forKeyPath:@"contentLayoutRect" context:keyValueObservingContext];
+        [_observedWindow removeObserver:self forKeyPath:@"titlebarAppearsTransparent" context:keyValueObservingContext];
     }
 
-    _observedWindow = nil;
+    _observedWindow = window;
+
+    if (window) {
+        [window addObserver:self forKeyPath:@"contentLayoutRect" options:NSKeyValueObservingOptionInitial context:keyValueObservingContext];
+        [window addObserver:self forKeyPath:@"titlebarAppearsTransparent" options:NSKeyValueObservingOptionInitial context:keyValueObservingContext];
+    }
 }
 
 - (void)startObservingFontPanel