Changeset 157968 in webkit

Timestamp:

Oct 24, 2013, 5:43:54 PM (13 years ago)

Author:

barraclough@apple.com

Message:

Simplify window occlusion detection code
​https://bugs.webkit.org/show_bug.cgi?id=123300

Reviewed by Tim Horton.

Currently the WKView tries to maintain a copy of the window's occluded state,
but forced to NO when occlusion detection is disabled (and capable of handling
dectection being dynamically toggled). Simpler to just rely on the actual value
from the window, && the enabled setting. Cleaning this up revealed that we're
not sending a viewStateDidChange to the WebPageProxy when the occlusion state
changes, which we probably should be.

• UIProcess/API/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::isViewVisible):

• check the real value of occlusion state from the window.

• UIProcess/API/mac/WKView.mm:

(-[WKView viewDidMoveToWindow]):

• don't update cached value.

(-[WKView _windowDidChangeOcclusionState:]):

• don't update cached value, but do send viewStateDidChange to the WebPageProxy.

(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):

• removed _isWindowOccluded.

(-[WKView windowOcclusionDetectionEnabled]):
(-[WKView setWindowOcclusionDetectionEnabled:]):

• Just toggle the flag - no cached state to update any more.

• UIProcess/API/mac/WKViewInternal.h:
  • removed _isWindowOccluded.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/PageClientImpl.mm (modified) (2 diffs)
• UIProcess/API/mac/WKView.mm (modified) (8 diffs)
• UIProcess/API/mac/WKViewInternal.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-10-24  Gavin Barraclough  <barraclough@apple.com>
+
+        Simplify window occlusion detection code
+        https://bugs.webkit.org/show_bug.cgi?id=123300
+
+        Reviewed by Tim Horton.
+
+        Currently the WKView tries to maintain a copy of the window's occluded state,
+        but forced to NO when occlusion detection is disabled (and capable of handling
+        dectection being dynamically toggled). Simpler to just rely on the actual value
+        from the window, && the enabled setting. Cleaning this up revealed that we're
+        not sending a viewStateDidChange to the WebPageProxy when the occlusion state
+        changes, which we probably should be.
+
+        * UIProcess/API/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::isViewVisible):
+            - check the real value of occlusion state from the window.
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView viewDidMoveToWindow]):
+            - don't update cached value.
+        (-[WKView _windowDidChangeOcclusionState:]):
+            - don't update cached value, but do send viewStateDidChange to the WebPageProxy.
+        (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+            - removed _isWindowOccluded.
+        (-[WKView windowOcclusionDetectionEnabled]):
+        (-[WKView setWindowOcclusionDetectionEnabled:]):
+            - Just toggle the flag - no cached state to update any more.
+        * UIProcess/API/mac/WKViewInternal.h:
+            - removed _isWindowOccluded.
+
 2013-10-24  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

@@ -39 +39 @@
 #import "WKStringCF.h"
 #import "WKViewInternal.h"
+#import "WKViewPrivate.h"
 #import "StringUtilities.h"
 #import "WebColorPickerMac.h"
@@ -202 +203 @@
         return false;
 
-    if ([m_wkView _isWindowOccluded])
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    if ([m_wkView windowOcclusionDetectionEnabled] && ([[m_wkView window] occlusionState] & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible)
         return false;
+#endif
 
     return true;

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -147 +147 @@
 - (void)_setDrawingAreaSize:(NSSize)size;
 - (void)_setPluginComplexTextInputState:(PluginComplexTextInputState)pluginComplexTextInputState;
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-- (void)_setIsWindowOccluded:(BOOL)isWindowOccluded;
-#endif
 @end
 
@@ -238 +234 @@
     NSRect _contentPreparationRect;
     BOOL _useContentPreparationRectForVisibleRect;
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-    BOOL _isWindowOccluded;
     BOOL _windowOcclusionDetectionEnabled;
-#endif
 }
 
@@ -1942 +1934 @@
     // update the active state.
     if ([self window]) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-        if (_data->_windowOcclusionDetectionEnabled)
-            [self _setIsWindowOccluded:([[self window] occlusionState] & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible];
-#endif
         _data->_windowHasValidBackingStore = NO;
         [self doWindowDidChangeScreen];
@@ -2072 +2060 @@
 - (void)_windowDidChangeOcclusionState:(NSNotification *)notification
 {
-    if (!_data->_windowOcclusionDetectionEnabled)
-        return;
-
-    [self _setIsWindowOccluded:([self.window occlusionState] & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible];
+    _data->_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
 }
 #endif
@@ -2257 +2242 @@
     NSPoint locationInViewCoordinates = [self convertPoint:[event locationInWindow] fromView:nil];
     _data->_page->performDictionaryLookupAtLocation(FloatPoint(locationInViewCoordinates.x, locationInViewCoordinates.y));
-}
-#endif
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-- (void)_setIsWindowOccluded:(BOOL)isWindowOccluded
-{
-    if (_data->_isWindowOccluded == isWindowOccluded)
-        return;
-    
-    _data->_isWindowOccluded = isWindowOccluded;
-    _data->_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
 }
 #endif
@@ -2919 +2893 @@
 }
 
-- (BOOL)_isWindowOccluded
-{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-    return _data->_isWindowOccluded;
-#else
-    return NO;
-#endif
-}
-
 @end
 
@@ -2983 +2948 @@
     _data->_clipsToVisibleRect = NO;
     _data->_useContentPreparationRectForVisibleRect = NO;
+    _data->_windowOcclusionDetectionEnabled = YES;
 
     _data->_intrinsicContentSize = NSMakeSize(NSViewNoInstrinsicMetric, NSViewNoInstrinsicMetric);
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-    _data->_isWindowOccluded = NO;
-    _data->_windowOcclusionDetectionEnabled = YES;
-#endif
 
     _data->_needsViewFrameInWindowCoordinates = _data->_page->pageGroup()->preferences()->pluginsEnabled();
@@ -3253 +3214 @@
 - (BOOL)windowOcclusionDetectionEnabled
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     return _data->_windowOcclusionDetectionEnabled;
-#else
-    return NO;
-#endif
 }
 
 - (void)setWindowOcclusionDetectionEnabled:(BOOL)flag
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-    if (_data->_windowOcclusionDetectionEnabled == flag)
-        return;
-
     _data->_windowOcclusionDetectionEnabled = flag;
-
-    if (flag) {
-        // When enabling window occlusion detection, update the view's current occluded state
-        // immediately, as the notification only fires when it changes.
-        if (self.window)
-            [self _setIsWindowOccluded:([self.window occlusionState] & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible];
-    } else {
-        // When disabling window occlusion detection, force the view to think it is not occluded,
-        // as it may already be occluded at the time of calling.
-        [self _setIsWindowOccluded:NO];
-    }
-#endif
 }
 

trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

@@ -97 +97 @@
 - (BOOL)_suppressVisibilityUpdates;
 
-- (BOOL)_isWindowOccluded;
-
 @end