Changeset 84042 in webkit

Timestamp:

Apr 15, 2011 3:31:29 PM (13 years ago)

Author:

andersca@apple.com

Message:

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 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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/FindController.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -540 +540 @@
 __ZN7WebCore20UserGestureIndicatorD1Ev
 __ZN7WebCore20protocolIsJavaScriptERKN3WTF6StringE
+__ZN7WebCore20makeRGBA32FromFloatsEffff
 __ZN7WebCore21BackForwardController11itemAtIndexEi
 __ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS0_4TypeEb

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

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

@@ -271 +271 @@
 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 Color overlayBackgroundColor()
-{
-    return Color(overlayBackgroundRed, overlayBackgroundGreen, overlayBackgroundBlue, overlayBackgroundAlpha);
-}
-
-void FindController::drawRect(PageOverlay*, GraphicsContext& graphicsContext, const IntRect& dirtyRect)
-{
+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(float fractionFadedIn)
+{
+    return Color(overlayBackgroundRed, overlayBackgroundGreen, overlayBackgroundBlue, overlayBackgroundAlpha * fractionFadedIn);
+}
+
+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.setFillColor(Color::white, ColorSpaceSRGB);
+    graphicsContext.setShadow(FloatSize(shadowOffsetX, shadowOffsetY), shadowBlurRadius, holeShadowColor(fractionFadedIn), ColorSpaceSRGB);
+
+    graphicsContext.setFillColor(holeFillColor(fractionFadedIn), ColorSpaceSRGB);
 
     // Draw white frames around the holes.

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

@@ -725 +725 @@
 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();
 }