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

Anders Carlsson · Anders Carlsson · commit 17204c258cd4 · 2011-04-15T22:31:29.000Z
Reviewed by Dan Bernstein. Fade the find page overlay https://bugs.webkit.org/show_bug.cgi?id=58697 Add a symbol that WebKit2 needs. * WebCore.exp.in: 2011-04-15 Anders Carlsson <andersca@apple.com> Reviewed by Dan Bernstein. Fade the find page overlay https://bugs.webkit.org/show_bug.cgi?id=58697 * WebProcess/WebPage/FindController.cpp: Make the color components floats. (WebKit::overlayBackgroundColor): (WebKit::holeShadowColor): (WebKit::holeFillColor): Add helper functions for returning the colors given the fraction faded in. (WebKit::FindController::drawRect): Use the new helper functions. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::installPageOverlay): Start the fade animation unless we're replacing an already existing page overlay with another. Canonical link: https://commits.webkit.org/73783@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84042 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-04-15  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Fade the find page overlay
+        https://bugs.webkit.org/show_bug.cgi?id=58697
+
+        Add a symbol that WebKit2 needs.
+
+        * WebCore.exp.in:
+
 2011-04-15  MORITA Hajime  <morrita@google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
@@ -539,6 +539,7 @@ __ZN7WebCore20SpaceSplitStringData12createVectorEv
 __ZN7WebCore20UserGestureIndicatorC1ENS_26ProcessingUserGestureStateE
 __ZN7WebCore20UserGestureIndicatorD1Ev
 __ZN7WebCore20protocolIsJavaScriptERKN3WTF6StringE
+__ZN7WebCore20makeRGBA32FromFloatsEffff
 __ZN7WebCore21BackForwardController11itemAtIndexEi
 __ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS0_4TypeEb
 __ZN7WebCore21PlatformKeyboardEventC1EP7NSEvent
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,26 @@
+2011-04-15  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Fade the find page overlay
+        https://bugs.webkit.org/show_bug.cgi?id=58697
+
+        * WebProcess/WebPage/FindController.cpp:
+        Make the color components floats.
+
+        (WebKit::overlayBackgroundColor):
+        (WebKit::holeShadowColor):
+        (WebKit::holeFillColor):
+        Add helper functions for returning the colors given the fraction faded in.
+
+        (WebKit::FindController::drawRect):
+        Use the new helper functions.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::installPageOverlay):
+        Start the fade animation unless we're replacing an already existing page overlay
+        with another.
+
 2011-04-15  Anders Carlsson  <andersca@apple.com>
 
         Fix Windows build.
diff --git a/Source/WebKit2/WebProcess/WebPage/FindController.cpp b/Source/WebKit2/WebProcess/WebPage/FindController.cpp
@@ -270,27 +270,39 @@ static const float shadowOffsetY = 1.0;
 static const float shadowBlurRadius = 2.0;
 static const float whiteFrameThickness = 1.0;
 
-static const int overlayBackgroundRed = 25;
-static const int overlayBackgroundGreen = 25;
-static const int overlayBackgroundBlue = 25;
-static const int overlayBackgroundAlpha = 63;
+static const float overlayBackgroundRed = 0.1;
+static const float overlayBackgroundGreen = 0.1;
+static const float overlayBackgroundBlue = 0.1;
+static const float overlayBackgroundAlpha = 0.25;
 
-static Color overlayBackgroundColor()
+static Color overlayBackgroundColor(float fractionFadedIn)
 {
-    return Color(overlayBackgroundRed, overlayBackgroundGreen, overlayBackgroundBlue, overlayBackgroundAlpha);
+    return Color(overlayBackgroundRed, overlayBackgroundGreen, overlayBackgroundBlue, overlayBackgroundAlpha * fractionFadedIn);
 }
 
-void FindController::drawRect(PageOverlay*, GraphicsContext& graphicsContext, const IntRect& dirtyRect)
+static Color holeShadowColor(float fractionFadedIn)
 {
+    return Color(0.0f, 0.0f, 0.0f, fractionFadedIn);
+}
+
+static Color holeFillColor(float fractionFadedIn)
+{
+    return Color(1.0f, 1.0f, 1.0f, fractionFadedIn);
+}
+
+void FindController::drawRect(PageOverlay* pageOverlay, GraphicsContext& graphicsContext, const IntRect& dirtyRect)
+{
+    float fractionFadedIn = pageOverlay->fractionFadedIn();
+
     Vector<IntRect> rects = rectsForTextMatches();
 
     // Draw the background.
-    graphicsContext.fillRect(dirtyRect, overlayBackgroundColor(), ColorSpaceSRGB);
+    graphicsContext.fillRect(dirtyRect, overlayBackgroundColor(fractionFadedIn), ColorSpaceSRGB);
 
     graphicsContext.save();
-    graphicsContext.setShadow(FloatSize(shadowOffsetX, shadowOffsetY), shadowBlurRadius, Color::black, ColorSpaceSRGB);
+    graphicsContext.setShadow(FloatSize(shadowOffsetX, shadowOffsetY), shadowBlurRadius, holeShadowColor(fractionFadedIn), ColorSpaceSRGB);
 
-    graphicsContext.setFillColor(Color::white, ColorSpaceSRGB);
+    graphicsContext.setFillColor(holeFillColor(fractionFadedIn), ColorSpaceSRGB);
 
     // Draw white frames around the holes.
     for (size_t i = 0; i < rects.size(); ++i) {
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -724,11 +724,24 @@ void WebPage::setFixedLayoutSize(const IntSize& size)
 
 void WebPage::installPageOverlay(PassRefPtr<PageOverlay> pageOverlay)
 {
-    if (m_pageOverlay)
-        pageOverlay->setPage(0);
+    bool shouldFadeIn = true;
+    
+    if (m_pageOverlay) {
+        m_pageOverlay->setPage(0);
+
+        if (pageOverlay) {
+            // We're installing a page overlay when a page overlay is already active.
+            // In this case we don't want to fade in the new overlay.
+            shouldFadeIn = false;
+        }
+    }
 
     m_pageOverlay = pageOverlay;
     m_pageOverlay->setPage(this);
+
+    if (shouldFadeIn)
+        m_pageOverlay->startFadeInAnimation();
+
     m_drawingArea->didInstallPageOverlay();
 }
 
