Changeset 84034 in webkit

Timestamp:

Apr 15, 2011 2:36:13 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-15 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Add the ability for PageOverlays to fade in and out
​https://bugs.webkit.org/show_bug.cgi?id=58694

• WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: (WKBundlePageUninstallPageOverlay): WebPage::uninstallPageOverlay now takes a boolean. Default to false for now.

• WebProcess/WebPage/FindController.cpp: (WebKit::FindController::findString): Pass false to uninstallPageOverlay.

(WebKit::FindController::hideFindUI):
Pass true to uninstallPageOverlay.

• WebProcess/WebPage/PageOverlay.cpp: (WebKit::PageOverlay::PageOverlay): Initialize new member variables.

(WebKit::PageOverlay::bounds):
Get rid of an unnecessary webPage() getter.

(WebKit::PageOverlay::setPage):
Stop the animation timer.

(WebKit::PageOverlay::startFadeInAnimation):
Update m_fractionFadedIn and call startFadeAnimation.

(WebKit::PageOverlay::startFadeOutAnimation):
Ditto.

(WebKit::PageOverlay::startFadeAnimation):
Initialize m_fadeAnimationStartTime and start the fade animation timer.

(WebKit::PageOverlay::fadeAnimationTimerFired):
Update m_fractionFadedIn and call setNeedsDisplay().

• WebProcess/WebPage/PageOverlay.h:
• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::uninstallPageOverlay): If fadeOut is true, tell the page overlay to start the fade out animation. When the fade animation is complete, the page overlay will uninstall itself.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (modified) (1 diff)
• WebProcess/WebPage/FindController.cpp (modified) (2 diffs)
• WebProcess/WebPage/PageOverlay.cpp (modified) (6 diffs)
• WebProcess/WebPage/PageOverlay.h (modified) (3 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-15  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add the ability for PageOverlays to fade in and out
+        https://bugs.webkit.org/show_bug.cgi?id=58694
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageUninstallPageOverlay):
+        WebPage::uninstallPageOverlay now takes a boolean. Default to false for now.
+
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::findString):
+        Pass false to uninstallPageOverlay.
+
+        (WebKit::FindController::hideFindUI):
+        Pass true to uninstallPageOverlay.
+        
+        * WebProcess/WebPage/PageOverlay.cpp:
+        (WebKit::PageOverlay::PageOverlay):
+        Initialize new member variables.
+
+        (WebKit::PageOverlay::bounds):
+        Get rid of an unnecessary webPage() getter.
+
+        (WebKit::PageOverlay::setPage):
+        Stop the animation timer.
+
+        (WebKit::PageOverlay::startFadeInAnimation):
+        Update m_fractionFadedIn and call startFadeAnimation.
+
+        (WebKit::PageOverlay::startFadeOutAnimation):
+        Ditto.
+        
+        (WebKit::PageOverlay::startFadeAnimation):
+        Initialize m_fadeAnimationStartTime and start the fade animation timer.
+
+        (WebKit::PageOverlay::fadeAnimationTimerFired):
+        Update m_fractionFadedIn and call setNeedsDisplay().
+
+        * WebProcess/WebPage/PageOverlay.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::uninstallPageOverlay):
+        If fadeOut is true, tell the page overlay to start the fade out animation.
+        When the fade animation is complete, the page overlay will uninstall itself.
+
 2011-04-15  Brian Weinstein  <bweinstein@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

@@ -176 +176 @@
 void WKBundlePageUninstallPageOverlay(WKBundlePageRef pageRef, WKBundlePageOverlayRef pageOverlayRef)
 {
-    toImpl(pageRef)->uninstallPageOverlay(toImpl(pageOverlayRef));
+    toImpl(pageRef)->uninstallPageOverlay(toImpl(pageOverlayRef), false);
 }
 

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

@@ -134 +134 @@
         if (m_findPageOverlay) {
             // Get rid of the overlay.
-            m_webPage->uninstallPageOverlay(m_findPageOverlay);
+            m_webPage->uninstallPageOverlay(m_findPageOverlay, false);
         }
         
@@ -154 +154 @@
 {
     if (m_findPageOverlay)
-        m_webPage->uninstallPageOverlay(m_findPageOverlay);
+        m_webPage->uninstallPageOverlay(m_findPageOverlay, true);
 
     hideFindIndicator();

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

@@ -28 +28 @@
 
 #include "WebPage.h"
+#include "WebProcess.h"
 #include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
@@ -38 +39 @@
 namespace WebKit {
 
+static const double fadeAnimationDuration = 0.2;
+static const double fadeAnimationFrameRate = 30;
+
 PassRefPtr<PageOverlay> PageOverlay::create(Client* client)
 {
@@ -46 +50 @@
     : m_client(client)
     , m_webPage(0)
+    , m_fadeAnimationTimer(WebProcess::shared().runLoop(), this, &PageOverlay::fadeAnimationTimerFired)
+    , m_fadeAnimationStartTime(0.0)
+    , m_fadeAnimationDuration(fadeAnimationDuration)
+    , m_fadeAnimationType(NoAnimation)
+    , m_fractionFadedIn(1.0)
 {
 }
@@ -55 +64 @@
 IntRect PageOverlay::bounds() const
 {
-    FrameView* frameView = webPage()->corePage()->mainFrame()->view();
+    FrameView* frameView = m_webPage->corePage()->mainFrame()->view();
 
     int width = frameView->width();
@@ -74 +83 @@
     m_webPage = webPage;
     m_client->didMoveToWebPage(this, webPage);
+
+    if (m_webPage)
+        setNeedsDisplay();
+
+    m_fadeAnimationTimer.stop();
 }
 
@@ -113 +127 @@
 }
 
+void PageOverlay::startFadeInAnimation()
+{
+    m_fractionFadedIn = 0.0;
+    m_fadeAnimationType = FadeInAnimation;
+
+    startFadeAnimation();
+}
+
+void PageOverlay::startFadeOutAnimation()
+{
+    m_fractionFadedIn = 1.0;
+    m_fadeAnimationType = FadeOutAnimation;
+
+    startFadeAnimation();
+}
+
+void PageOverlay::startFadeAnimation()
+{
+    m_fadeAnimationStartTime = currentTime();
+    
+    // Start the timer
+    m_fadeAnimationTimer.startRepeating(1 / fadeAnimationFrameRate);
+}
+
+void PageOverlay::fadeAnimationTimerFired()
+{
+    float animationProgress = (currentTime() - m_fadeAnimationStartTime) / m_fadeAnimationDuration;
+
+    if (animationProgress >= 1.0)
+        animationProgress = 1.0;
+
+    double sine = sin(M_PI_2 * animationProgress);
+    float fadeAnimationValue = sine * sine;
+
+    m_fractionFadedIn = (m_fadeAnimationType == FadeInAnimation) ? fadeAnimationValue : 1 - fadeAnimationValue;
+    setNeedsDisplay();
+
+    if (animationProgress == 1.0) {
+        m_fadeAnimationTimer.stop();
+
+        bool wasFadingOut = m_fadeAnimationType == FadeOutAnimation;
+        m_fadeAnimationType = NoAnimation;
+
+        if (wasFadingOut) {
+            // If this was a fade out, go ahead and uninstall the page overlay.
+            m_webPage->uninstallPageOverlay(this, false);
+        }
+    }
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebPage/PageOverlay.h

@@ -28 +28 @@
 
 #include "APIObject.h"
+#include "RunLoop.h"
 #include <wtf/PassRefPtr.h>
 
@@ -66 +67 @@
     bool mouseEvent(const WebMouseEvent&);
 
+    void startFadeInAnimation();
+    void startFadeOutAnimation();
+
+    float fractionFadedIn() const { return m_fractionFadedIn; }
+
 protected:
     explicit PageOverlay(Client*);
-
-    WebPage* webPage() const { return m_webPage; }
 
 private:
@@ -77 +81 @@
     WebCore::IntRect bounds() const;
 
+    void startFadeAnimation();
+    void fadeAnimationTimerFired();
+
     Client* m_client;
+    WebPage* m_webPage;
 
-    WebPage* m_webPage;
+    RunLoop::Timer<PageOverlay> m_fadeAnimationTimer;
+    double m_fadeAnimationStartTime;
+    double m_fadeAnimationDuration;
+
+    enum FadeAnimationType {
+        NoAnimation,
+        FadeInAnimation,
+        FadeOutAnimation,
+    };
+
+    FadeAnimationType m_fadeAnimationType;
+    float m_fractionFadedIn;
 };
 

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

@@ -730 +730 @@
     m_pageOverlay = pageOverlay;
     m_pageOverlay->setPage(this);
-
     m_drawingArea->didInstallPageOverlay();
-
-    m_pageOverlay->setNeedsDisplay();
-}
-
-void WebPage::uninstallPageOverlay(PageOverlay* pageOverlay)
+}
+
+void WebPage::uninstallPageOverlay(PageOverlay* pageOverlay, bool fadeOut)
 {
     if (pageOverlay != m_pageOverlay)
         return;
+
+    if (fadeOut) {
+        m_pageOverlay->startFadeOutAnimation();
+        return;
+    }
 
     m_pageOverlay->setPage(0);

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -253 +253 @@
     bool windowIsFocused() const;
     void installPageOverlay(PassRefPtr<PageOverlay>);
-    void uninstallPageOverlay(PageOverlay*);
+    void uninstallPageOverlay(PageOverlay*, bool fadeOut);
     bool hasPageOverlay() const { return m_pageOverlay; }
     WebCore::IntRect windowToScreen(const WebCore::IntRect&);