[webkit-changes] [183220] trunk/Source/WebKit2

[jer . noble]

Title: [183220] trunk/Source/WebKit2

Revision

183220

Author

jer.no...@apple.com

Date

2015-04-23 15:40:19 -0700 (Thu, 23 Apr 2015)

Log Message

[WK2][Mac] Tweak the timing curve of the WebKit Fullscreen animation
https://bugs.webkit.org/show_bug.cgi?id=144120

Reviewed by Eric Carlson.

Tweak the curve to ease-in faster when the fullscreen animation duration is short.

* UIProcess/mac/WKFullScreenWindowController.mm:
(timingFunctionForDuration):
(zoomAnimation):
(maskAnimation):
(fadeAnimation):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

Diff

Modified: trunk/Source/WebKit2/ChangeLog (183219 => 183220)

--- trunk/Source/WebKit2/ChangeLog	2015-04-23 22:34:10 UTC (rev 183219)
+++ trunk/Source/WebKit2/ChangeLog	2015-04-23 22:40:19 UTC (rev 183220)
@@ -1,3 +1,18 @@
+2015-04-23  Jer Noble  <jer.no...@apple.com>
+
+        [WK2][Mac] Tweak the timing curve of the WebKit Fullscreen animation
+        https://bugs.webkit.org/show_bug.cgi?id=144120
+
+        Reviewed by Eric Carlson.
+
+        Tweak the curve to ease-in faster when the fullscreen animation duration is short.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (timingFunctionForDuration):
+        (zoomAnimation):
+        (maskAnimation):
+        (fadeAnimation):
+
 2015-04-23  Enrica Casucci  <enr...@apple.com>
 
         iOS build fix after r183208.

Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (183219 => 183220)

--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2015-04-23 22:34:10 UTC (rev 183219)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2015-04-23 22:40:19 UTC (rev 183220)
@@ -507,6 +507,13 @@
     [CATransaction commit];
 }
 
+static CAMediaTimingFunction *timingFunctionForDuration(CFTimeInterval duration)
+{
+    if (duration >= 0.8)
+        return [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+    return [CAMediaTimingFunction functionWithControlPoints:.25 :0 :0 :1];
+}
+
 enum AnimationDirection { AnimateIn, AnimateOut };
 static CAAnimation *zoomAnimation(const FloatRect& initialFrame, const FloatRect& finalFrame, const FloatRect& screenFrame, CFTimeInterval duration, AnimationDirection direction)
 {
@@ -526,7 +533,7 @@
     scaleAnimation.duration = duration;
     scaleAnimation.removedOnCompletion = NO;
     scaleAnimation.fillMode = kCAFillModeBoth;
-    scaleAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+    scaleAnimation.timingFunction = timingFunctionForDuration(duration);
     return scaleAnimation;
 }
 
@@ -552,7 +559,7 @@
     animation.duration = duration;
     animation.removedOnCompletion = NO;
     animation.fillMode = kCAFillModeBoth;
-    animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+    animation.timingFunction = timingFunctionForDuration(duration);
     return animation;
 }
 
@@ -566,7 +573,7 @@
     fadeAnimation.duration = duration;
     fadeAnimation.removedOnCompletion = NO;
     fadeAnimation.fillMode = kCAFillModeBoth;
-    fadeAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+    fadeAnimation.timingFunction = timingFunctionForDuration(duration);
     return fadeAnimation;
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes