Changeset 173544 in webkit

Timestamp:

Sep 11, 2014, 3:18:58 PM (12 years ago)

Author:

Beth Dakin

Message:

WebKit scrollbars flash in non-dominant spaces when entering Mission Control
​https://bugs.webkit.org/show_bug.cgi?id=136761
-and corresponding-
rdar://problem/18195616

Reviewed by Tim Horton.

This patch makes our logic about when to call ScrollableArea::contentAreaDidHide/
Show match the logic in AppKit. We only want these notifications when the window
has become both visible and active (or lost both, in the case of hide).

Re-name setIsVisibleInternal() to setIsVisibleAndActiveInternal(), and call it
only when both visibility and active-state have changed.

• page/FocusController.cpp:

(WebCore::FocusController::setViewState):
(WebCore::FocusController::setIsVisibleAndActiveInternal):
(WebCore::FocusController::setIsVisibleInternal): Deleted.

• page/FocusController.h:

FocusController::setViewState() is the only place that needs to call
ScrollableArea::contentAreaDidHide/Show, so remove these callers.

• page/FrameView.cpp:

(WebCore::FrameView::didMoveOnscreen): Deleted.
(WebCore::FrameView::willMoveOffscreen): Deleted.

• page/FrameView.h:
• page/Page.cpp:

(WebCore::Page::setIsVisibleInternal):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FocusController.cpp (modified) (2 diffs)
• page/FocusController.h (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/FrameView.h (modified) (1 diff)
• page/Page.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-11  Beth Dakin  <bdakin@apple.com>
+
+        WebKit scrollbars flash in non-dominant spaces when entering Mission Control
+        https://bugs.webkit.org/show_bug.cgi?id=136761
+        -and corresponding-
+        rdar://problem/18195616
+
+        Reviewed by Tim Horton.
+
+        This patch makes our logic about when to call ScrollableArea::contentAreaDidHide/
+        Show match the logic in AppKit. We only want these notifications when the window 
+        has become both visible and active (or lost both, in the case of hide).
+
+        Re-name setIsVisibleInternal() to setIsVisibleAndActiveInternal(), and call it 
+        only when both visibility and active-state have changed.
+        * page/FocusController.cpp:
+        (WebCore::FocusController::setViewState):
+        (WebCore::FocusController::setIsVisibleAndActiveInternal):
+        (WebCore::FocusController::setIsVisibleInternal): Deleted.
+        * page/FocusController.h:
+
+        FocusController::setViewState() is the only place that needs to call 
+        ScrollableArea::contentAreaDidHide/Show, so remove these callers.
+        * page/FrameView.cpp:
+        (WebCore::FrameView::didMoveOnscreen): Deleted.
+        (WebCore::FrameView::willMoveOffscreen): Deleted.
+        * page/FrameView.h:
+        * page/Page.cpp:
+        (WebCore::Page::setIsVisibleInternal):
+
 2014-09-10  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WebCore/page/FocusController.cpp

@@ -646 +646 @@
     if (changed & ViewState::IsFocused)
         setFocusedInternal(viewState & ViewState::IsFocused);
-    if (changed & ViewState::WindowIsActive)
+    if (changed & ViewState::WindowIsActive) {
         setActiveInternal(viewState & ViewState::WindowIsActive);
-    if (changed & ViewState::IsVisible)
-        setIsVisibleInternal(viewState & ViewState::IsVisible);
+        if (changed & ViewState::IsVisible)
+            setIsVisibleAndActiveInternal(viewState & ViewState::WindowIsActive);
+    }
 }
 
@@ -680 +681 @@
 }
 
-void FocusController::setIsVisibleInternal(bool contentIsVisible)
+void FocusController::setIsVisibleAndActiveInternal(bool contentIsVisible)
 {
     FrameView* view = m_page.mainFrame().view();

trunk/Source/WebCore/page/FocusController.h

@@ -96 +96 @@
     void setActiveInternal(bool);
     void setFocusedInternal(bool);
-    void setIsVisibleInternal(bool);
+    void setIsVisibleAndActiveInternal(bool);
 
     bool advanceFocusDirectionally(FocusDirection, KeyboardEvent*);

trunk/Source/WebCore/page/FrameView.cpp

@@ -1062 +1062 @@
 }
 
-void FrameView::didMoveOnscreen()
-{
-    contentAreaDidShow();
-}
-
-void FrameView::willMoveOffscreen()
-{
-    contentAreaDidHide();
-}
-
 void FrameView::setIsInWindow(bool isInWindow)
 {

trunk/Source/WebCore/page/FrameView.h

@@ -178 +178 @@
     WEBCORE_EXPORT bool isSoftwareRenderable() const;
 
-    void didMoveOnscreen();
-    void willMoveOffscreen();
     void setIsInWindow(bool);
 

trunk/Source/WebCore/page/Page.cpp

@@ -1254 +1254 @@
         m_isPrerender = false;
 
-        for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
-            if (FrameView* frameView = frame->view())
-                frameView->didMoveOnscreen();
-        }
-
         resumeScriptedAnimations();
 
@@ -1280 +1275 @@
         if (m_settings->hiddenPageCSSAnimationSuspensionEnabled())
             mainFrame().animation().suspendAnimations();
-
-        for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
-            if (FrameView* frameView = frame->view())
-                frameView->willMoveOffscreen();
-        }
 
         suspendScriptedAnimations();