Title: [160740] trunk/Source/WebKit2
- Revision
- 160740
- Author
- [email protected]
- Date
- 2013-12-17 17:05:50 -0800 (Tue, 17 Dec 2013)
Log Message
WebKit2 View Gestures: Fix the shadow layer restore-from-overpinched animation
https://bugs.webkit.org/show_bug.cgi?id=125884
Reviewed by Anders Carlsson.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom):
Set to-values on the right animations.
(WebKit::TiledCoreAnimationDrawingArea::adjustTransientZoom):
(WebKit::TiledCoreAnimationDrawingArea::applyTransientZoomToPage):
We don't need to explicitly set the shadow path, because PlatformCALayer::setBounds does it for us now.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160739 => 160740)
--- trunk/Source/WebKit2/ChangeLog 2013-12-18 00:57:44 UTC (rev 160739)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-18 01:05:50 UTC (rev 160740)
@@ -1,3 +1,18 @@
+2013-12-17 Tim Horton <[email protected]>
+
+ WebKit2 View Gestures: Fix the shadow layer restore-from-overpinched animation
+ https://bugs.webkit.org/show_bug.cgi?id=125884
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom):
+ Set to-values on the right animations.
+
+ (WebKit::TiledCoreAnimationDrawingArea::adjustTransientZoom):
+ (WebKit::TiledCoreAnimationDrawingArea::applyTransientZoomToPage):
+ We don't need to explicitly set the shadow path, because PlatformCALayer::setBounds does it for us now.
+
2013-12-17 Sam Weinig <[email protected]>
[WK2] Rename WebURLRequest to API::URLRequest
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (160739 => 160740)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-18 00:57:44 UTC (rev 160739)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-18 01:05:50 UTC (rev 160740)
@@ -733,7 +733,6 @@
shadowLayer->setBounds(shadowBounds);
shadowLayer->setPosition(origin + shadowBounds.center());
- shadowLayer->platformLayer().shadowPath = adoptCF(CGPathCreateWithRect(shadowBounds, NULL)).get();
m_transientZoomScale = scale;
}
@@ -795,9 +794,9 @@
RetainPtr<CABasicAnimation> shadowBoundsAnimation = transientZoomSnapAnimationForKeyPath("bounds");
[shadowBoundsAnimation setToValue:[NSValue valueWithRect:shadowBounds]];
RetainPtr<CABasicAnimation> shadowPositionAnimation = transientZoomSnapAnimationForKeyPath("position");
- [shadowBoundsAnimation setToValue:[NSValue valueWithPoint:constrainedOrigin + shadowBounds.center()]];
+ [shadowPositionAnimation setToValue:[NSValue valueWithPoint:constrainedOrigin + shadowBounds.center()]];
RetainPtr<CABasicAnimation> shadowPathAnimation = transientZoomSnapAnimationForKeyPath("shadowPath");
- [shadowBoundsAnimation setToValue:(id)shadowPath.get()];
+ [shadowPathAnimation setToValue:(id)shadowPath.get()];
[CATransaction begin];
[CATransaction setCompletionBlock:^(void) {
@@ -830,7 +829,6 @@
IntRect overflowRect = renderView->pixelSnappedLayoutOverflowRect();
shadowLayer->setBounds(IntRect(IntPoint(), toIntSize(overflowRect.maxXMaxYCorner())));
shadowLayer->setPosition(shadowLayer->bounds().center());
- ScrollbarTheme::theme()->setUpContentShadowLayer(renderView->compositor().layerForContentShadow());
FloatPoint unscrolledOrigin(origin);
FloatRect visibleContentRect = m_webPage->mainFrameView()->visibleContentRect(ScrollableArea::IncludeScrollbars);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
