Changeset 106875 in webkit

Timestamp:

Feb 6, 2012 4:43:26 PM (12 years ago)

Author:

andersca@apple.com

Message:

Source/WebCore: Overlay scrollbars flash when window is simply activated
​https://bugs.webkit.org/show_bug.cgi?id=77911
<rdar://problem/10211995>

Reviewed by Kenneth Russell.

Add a new member function, FocusController::setContainingWindowIsVisible, and move the code
that calls ScrollableArea::contentAreaDidShow/ScrollableArea::contentAreaDidHide there, since
we only want to flash scrollers when the window becomes visible.

• WebCore.exp.in:
• page/FocusController.cpp:

(WebCore::FocusController::FocusController):
(WebCore::FocusController::setActive):
(WebCore::FocusController::setContainingWindowIsVisible):
(WebCore):

• page/FocusController.h:

(FocusController):
(WebCore::FocusController::containingWindowIsVisible):

• platform/mac/ScrollAnimatorMac.mm:

(-[WebScrollbarPainterControllerDelegate scrollerImpPair:setContentAreaNeedsDisplayInRect:]):
Call ScrollAnimatorMac::contentAreaWillPaint here, since that will trigger AppKit to flash the scrollers.

Source/WebKit/mac: Overlay scrollbars flash when window is simply activated
​https://bugs.webkit.org/show_bug.cgi?id=77911
<rdar://problem/10211995>

Reviewed by Kenneth Russell.

• WebView/WebView.mm:

(-[WebView _windowWillOrderOnScreen:]):
(-[WebView _windowWillOrderOffScreen:]):
Call FocusController::setContainingWindowIsVisible.

Source/WebKit2: Overlay scrollbars flash when window is simply activated
​https://bugs.webkit.org/show_bug.cgi?id=77911

Reviewed by Kenneth Russell.

• UIProcess/API/mac/WKView.mm:

(-[WKView _updateWindowVisibility]):
Use -[NSWindow isVisible] here, since we also want to consider the window hidden if the application itself is hidden.

(-[WKView _windowDidOrderOffScreen:]):
(-[WKView _windowDidOrderOnScreen:]):
Call -[WKView updateWindowVisibility].

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setWindowIsVisible):
Call FocusController::setContainingWindowIsVisible.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/FocusController.cpp (modified) (3 diffs)
• WebCore/page/FocusController.h (modified) (2 diffs)
• WebCore/platform/mac/ScrollAnimatorMac.mm (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/mac/WKView.mm (modified) (3 diffs)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Anders Carlsson  <andersca@apple.com>
+
+        Overlay scrollbars flash when window is simply activated
+        https://bugs.webkit.org/show_bug.cgi?id=77911
+        <rdar://problem/10211995>
+
+        Reviewed by Kenneth Russell.
+
+        Add a new member function, FocusController::setContainingWindowIsVisible, and move the code
+        that calls ScrollableArea::contentAreaDidShow/ScrollableArea::contentAreaDidHide there, since
+        we only want to flash scrollers when the window becomes visible.
+
+        * WebCore.exp.in:
+        * page/FocusController.cpp:
+        (WebCore::FocusController::FocusController):
+        (WebCore::FocusController::setActive):
+        (WebCore::FocusController::setContainingWindowIsVisible):
+        (WebCore):
+        * page/FocusController.h:
+        (FocusController):
+        (WebCore::FocusController::containingWindowIsVisible):
+
+        * platform/mac/ScrollAnimatorMac.mm:
+        (-[WebScrollbarPainterControllerDelegate scrollerImpPair:setContentAreaNeedsDisplayInRect:]):
+        Call ScrollAnimatorMac::contentAreaWillPaint here, since that will trigger AppKit to flash the scrollers.
+
 2012-02-06  Greg Simon  <gregsimon@chromium.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -435 +435 @@
 __ZN7WebCore15FocusController15setFocusedFrameEN3WTF10PassRefPtrINS_5FrameEEE
 __ZN7WebCore15FocusController15setInitialFocusENS_14FocusDirectionEPNS_13KeyboardEventE
+__ZN7WebCore15FocusController28setContainingWindowIsVisibleEb
 __ZN7WebCore15FocusController9setActiveEb
 __ZN7WebCore15GraphicsContext11clearShadowEv

trunk/Source/WebCore/page/FocusController.cpp

@@ -89 +89 @@
     , m_isFocused(false)
     , m_isChangingFocusedFrame(false)
+    , m_containingWindowIsVisible(false)
 {
 }
@@ -574 +575 @@
             view->updateControlTints();
         }
-
-        if (const HashSet<ScrollableArea*>* scrollableAreas = m_page->scrollableAreaSet()) {
-            HashSet<ScrollableArea*>::const_iterator end = scrollableAreas->end(); 
-            for (HashSet<ScrollableArea*>::const_iterator it = scrollableAreas->begin(); it != end; ++it) {
-                if (!active)
-                    (*it)->contentAreaDidHide();
-                else
-                    (*it)->contentAreaDidShow();
-            }
-        }
     }
 
@@ -590 +581 @@
     if (m_focusedFrame && isFocused())
         dispatchEventsOnWindowAndFocusedNode(m_focusedFrame->document(), active);
+}
+
+void FocusController::setContainingWindowIsVisible(bool containingWindowIsVisible)
+{
+    if (m_containingWindowIsVisible == containingWindowIsVisible)
+        return;
+
+    m_containingWindowIsVisible = containingWindowIsVisible;
+
+    FrameView* view = m_page->mainFrame()->view();
+    if (!view)
+        return;
+
+    if (const HashSet<ScrollableArea*>* scrollableAreas = m_page->scrollableAreaSet()) {
+        HashSet<ScrollableArea*>::const_iterator end = scrollableAreas->end(); 
+        for (HashSet<ScrollableArea*>::const_iterator it = scrollableAreas->begin(); it != end; ++it) {
+            if (!containingWindowIsVisible)
+                (*it)->contentAreaDidHide();
+            else
+                (*it)->contentAreaDidShow();
+        }
+    }
 }
 

trunk/Source/WebCore/page/FocusController.h

@@ -64 +64 @@
     bool isFocused() const { return m_isFocused; }
 
+    void setContainingWindowIsVisible(bool);
+    bool containingWindowIsVisible() const { return m_containingWindowIsVisible; }
+
     bool transferFocusToElementInShadowRoot(Element* shadowHost, bool restorePreviousSelection);
 
@@ -97 +100 @@
     bool m_isFocused;
     bool m_isChangingFocusedFrame;
+    bool m_containingWindowIsVisible;
 
 };

trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

@@ -254 +254 @@
     UNUSED_PARAM(scrollerImpPair);
     UNUSED_PARAM(rect);
+
+    if (!_scrollableArea)
+        return;
+
+    if (!_scrollableArea->isOnActivePage())
+        return;
+
+    _scrollableArea->scrollAnimator()->contentAreaWillPaint();
 }
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2012-02-06  Anders Carlsson  <andersca@apple.com>
+
+        Overlay scrollbars flash when window is simply activated
+        https://bugs.webkit.org/show_bug.cgi?id=77911
+        <rdar://problem/10211995>
+
+        Reviewed by Kenneth Russell.
+
+        * WebView/WebView.mm:
+        (-[WebView _windowWillOrderOnScreen:]):
+        (-[WebView _windowWillOrderOffScreen:]):
+        Call FocusController::setContainingWindowIsVisible.
+
+
 2012-02-06  Matthew Delaney  <mdelaney@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -3470 +3470 @@
     [self doWindowDidChangeScreen];
 
-    if (_private && _private->page)
-        _private->page->resumeScriptedAnimations();    
+    if (_private && _private->page) {
+        _private->page->resumeScriptedAnimations();
+        _private->page->focusController()->setContainingWindowIsVisible(true);
+    }
 }
 
@@ -3481 +3483 @@
 - (void)_windowWillOrderOffScreen:(NSNotification *)notification
 {
-    if (_private && _private->page)
-        _private->page->suspendScriptedAnimations();    
+    if (_private && _private->page) {
+        _private->page->suspendScriptedAnimations();
+        _private->page->focusController()->setContainingWindowIsVisible(false);
+    }
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-06  Anders Carlsson  <andersca@apple.com>
+
+        Overlay scrollbars flash when window is simply activated
+        https://bugs.webkit.org/show_bug.cgi?id=77911
+
+        Reviewed by Kenneth Russell.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _updateWindowVisibility]):
+        Use -[NSWindow isVisible] here, since we also want to consider the window hidden if the application itself is hidden.
+
+        (-[WKView _windowDidOrderOffScreen:]):
+        (-[WKView _windowDidOrderOnScreen:]):
+        Call -[WKView updateWindowVisibility].
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setWindowIsVisible):
+        Call FocusController::setContainingWindowIsVisible.
+
 2012-02-06  Martin Robinson  <mrobinson@igalia.com>
 

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

@@ -1710 +1710 @@
 - (void)_updateWindowVisibility
 {
-    _data->_page->updateWindowIsVisible(![[self window] isMiniaturized]);
+    _data->_page->updateWindowIsVisible([[self window] isVisible]);
 }
 
@@ -1925 +1925 @@
     _data->_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
     _data->_page->viewStateDidChange(WebPageProxy::ViewWindowIsActive);
+    [self _updateWindowVisibility];
 }
 
@@ -1933 +1934 @@
     _data->_page->viewStateDidChange(WebPageProxy::ViewWindowIsActive);
     _data->_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
+    [self _updateWindowVisibility];
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -2389 +2389 @@
     m_windowIsVisible = windowIsVisible;
 
+    corePage()->focusController()->setContainingWindowIsVisible(windowIsVisible);
+
     // Tell all our plug-in views that the window visibility changed.
     for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)