<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167860] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167860">167860</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-27 13:42:54 -0700 (Sun, 27 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit2 View Gestures (Zoom): Pages with 'background-attachment: fixed' don't behave correctly when zoomed
https://bugs.webkit.org/show_bug.cgi?id=132225
<rdar://problem/15729975>
Reviewed by Darin Adler.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::layerForTransientZoom):
(WebKit::TiledCoreAnimationDrawingArea::shadowLayerForTransientZoom):
(WebKit::TiledCoreAnimationDrawingArea::adjustTransientZoom):
(WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom):
(WebKit::TiledCoreAnimationDrawingArea::applyTransientZoomToPage):
Factor out code to choose which layer (and shadow layer) to apply the transient zoom to.
If we have a contentsContainmentLayer (because we have composited background-attachment: fixed),
it applies page scale, so we should apply the transient zoom to that layer
instead of the RenderView's main GraphicsLayer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167859 => 167860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-27 19:47:36 UTC (rev 167859)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-27 20:42:54 UTC (rev 167860)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-04-27 Tim Horton <timothy_horton@apple.com>
+
+ WebKit2 View Gestures (Zoom): Pages with 'background-attachment: fixed' don't behave correctly when zoomed
+ https://bugs.webkit.org/show_bug.cgi?id=132225
+ <rdar://problem/15729975>
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::layerForTransientZoom):
+ (WebKit::TiledCoreAnimationDrawingArea::shadowLayerForTransientZoom):
+ (WebKit::TiledCoreAnimationDrawingArea::adjustTransientZoom):
+ (WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom):
+ (WebKit::TiledCoreAnimationDrawingArea::applyTransientZoomToPage):
+ Factor out code to choose which layer (and shadow layer) to apply the transient zoom to.
+ If we have a contentsContainmentLayer (because we have composited background-attachment: fixed),
+ it applies page scale, so we should apply the transient zoom to that layer
+ instead of the RenderView's main GraphicsLayer.
+
</ins><span class="cx"> 2014-04-27 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. iOS build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (167859 => 167860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2014-04-27 19:47:36 UTC (rev 167859)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2014-04-27 20:42:54 UTC (rev 167860)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class FrameView;
</span><ins>+class PlatformCALayer;
</ins><span class="cx"> class TiledBacking;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -94,6 +95,8 @@
</span><span class="cx"> virtual void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override;
</span><span class="cx"> virtual void commitTransientZoom(double scale, WebCore::FloatPoint origin) override;
</span><span class="cx"> void applyTransientZoomToPage(double scale, WebCore::FloatPoint origin);
</span><ins>+ WebCore::PlatformCALayer* layerForTransientZoom() const;
+ WebCore::PlatformCALayer* shadowLayerForTransientZoom() const;
</ins><span class="cx">
</span><span class="cx"> virtual WebCore::TransformationMatrix rootLayerTransform() const override { return m_transform; }
</span><span class="cx"> virtual void setRootLayerTransform(const WebCore::TransformationMatrix&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (167859 => 167860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-04-27 19:47:36 UTC (rev 167859)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-04-27 20:42:54 UTC (rev 167860)
</span><span class="lines">@@ -486,6 +486,26 @@
</span><span class="cx"> return frameView && frameView->frame().isMainFrame();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PlatformCALayer* TiledCoreAnimationDrawingArea::layerForTransientZoom() const
+{
+ RenderLayerBacking* renderViewBacking = m_webPage->mainFrameView()->renderView()->layer()->backing();
+
+ if (GraphicsLayer* contentsContainmentLayer = renderViewBacking->contentsContainmentLayer())
+ return toGraphicsLayerCA(contentsContainmentLayer)->platformCALayer();
+
+ return toGraphicsLayerCA(renderViewBacking->graphicsLayer())->platformCALayer();
+}
+
+PlatformCALayer* TiledCoreAnimationDrawingArea::shadowLayerForTransientZoom() const
+{
+ RenderLayerCompositor& renderLayerCompositor = m_webPage->mainFrameView()->renderView()->compositor();
+
+ if (GraphicsLayer* shadowGraphicsLayer = renderLayerCompositor.layerForContentShadow())
+ return toGraphicsLayerCA(shadowGraphicsLayer)->platformCALayer();
+
+ return nullptr;
+}
+
</ins><span class="cx"> void TiledCoreAnimationDrawingArea::adjustTransientZoom(double scale, FloatPoint origin)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Scrollbars should stay in-place and change height while zooming.
</span><span class="lines">@@ -499,16 +519,13 @@
</span><span class="cx"> transform.translate(origin.x(), origin.y());
</span><span class="cx"> transform.scale(scale);
</span><span class="cx">
</span><del>- RenderView* renderView = m_webPage->mainFrameView()->renderView();
- PlatformCALayer* renderViewLayer = toGraphicsLayerCA(renderView->layer()->backing()->graphicsLayer())->platformCALayer();
- renderViewLayer->setTransform(transform);
- renderViewLayer->setAnchorPoint(FloatPoint3D());
- renderViewLayer->setPosition(FloatPoint3D());
</del><ins>+ PlatformCALayer* zoomLayer = layerForTransientZoom();
+ zoomLayer->setTransform(transform);
+ zoomLayer->setAnchorPoint(FloatPoint3D());
+ zoomLayer->setPosition(FloatPoint3D());
</ins><span class="cx">
</span><del>- GraphicsLayerCA* shadowGraphicsLayer = toGraphicsLayerCA(renderView->compositor().layerForContentShadow());
- if (shadowGraphicsLayer) {
- PlatformCALayer* shadowLayer = shadowGraphicsLayer->platformCALayer();
-
</del><ins>+ if (PlatformCALayer* shadowLayer = shadowLayerForTransientZoom()) {
+ RenderView* renderView = m_webPage->mainFrameView()->renderView();
</ins><span class="cx"> FloatRect shadowBounds = FloatRect(FloatPoint(), toFloatSize(renderView->layoutOverflowRect().maxXMaxYCorner()));
</span><span class="cx"> shadowBounds.scale(scale);
</span><span class="cx">
</span><span class="lines">@@ -536,15 +553,13 @@
</span><span class="cx"> void TiledCoreAnimationDrawingArea::commitTransientZoom(double scale, FloatPoint origin)
</span><span class="cx"> {
</span><span class="cx"> FrameView* frameView = m_webPage->mainFrameView();
</span><del>- RenderView* renderView = frameView->renderView();
- PlatformCALayer* renderViewLayer = static_cast<GraphicsLayerCA*>(renderView->layer()->backing()->graphicsLayer())->platformCALayer();
-
</del><span class="cx"> FloatRect visibleContentRect = frameView->visibleContentRectIncludingScrollbars();
</span><span class="cx">
</span><span class="cx"> FloatPoint constrainedOrigin = visibleContentRect.location();
</span><span class="cx"> constrainedOrigin.moveBy(-origin);
</span><span class="cx">
</span><del>- IntRect documentRect = frameView->renderView()->unscaledDocumentRect();
</del><ins>+ RenderView* renderView = frameView->renderView();
+ IntRect documentRect = renderView->unscaledDocumentRect();
</ins><span class="cx"> documentRect.scale(scale);
</span><span class="cx">
</span><span class="cx"> // Scaling may have exposed the overhang area, so we need to constrain the final
</span><span class="lines">@@ -568,21 +583,23 @@
</span><span class="cx"> RefPtr<PlatformCAAnimation> renderViewAnimation = PlatformCAAnimationMac::create(renderViewAnimationCA.get());
</span><span class="cx"> renderViewAnimation->setToValue(transform);
</span><span class="cx">
</span><del>- RetainPtr<CALayer> shadowLayer;
- if (GraphicsLayerCA* shadowGraphicsLayer = toGraphicsLayerCA(renderView->compositor().layerForContentShadow()))
- shadowLayer = shadowGraphicsLayer->platformCALayer()->platformLayer();
</del><ins>+ RetainPtr<CALayer> shadowCALayer;
+ if (PlatformCALayer* shadowLayer = shadowLayerForTransientZoom())
+ shadowCALayer = shadowLayer->platformLayer();
</ins><span class="cx">
</span><ins>+ PlatformCALayer* zoomLayer = layerForTransientZoom();
+
</ins><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction setCompletionBlock:^(void) {
</span><del>- renderViewLayer->removeAnimationForKey("transientZoomCommit");
- if (shadowLayer)
- [shadowLayer removeAllAnimations];
</del><ins>+ zoomLayer->removeAnimationForKey("transientZoomCommit");
+ if (shadowCALayer)
+ [shadowCALayer removeAllAnimations];
</ins><span class="cx"> applyTransientZoomToPage(scale, origin);
</span><span class="cx"> }];
</span><span class="cx">
</span><del>- renderViewLayer->addAnimationForKey("transientZoomCommit", renderViewAnimation.get());
</del><ins>+ zoomLayer->addAnimationForKey("transientZoomCommit", renderViewAnimation.get());
</ins><span class="cx">
</span><del>- if (shadowLayer) {
</del><ins>+ if (shadowCALayer) {
</ins><span class="cx"> FloatRect shadowBounds = FloatRect(FloatPoint(), toFloatSize(renderView->layoutOverflowRect().maxXMaxYCorner()));
</span><span class="cx"> shadowBounds.scale(scale);
</span><span class="cx"> RetainPtr<CGPathRef> shadowPath = adoptCF(CGPathCreateWithRect(shadowBounds, NULL)).get();
</span><span class="lines">@@ -594,9 +611,9 @@
</span><span class="cx"> RetainPtr<CABasicAnimation> shadowPathAnimation = transientZoomSnapAnimationForKeyPath("shadowPath");
</span><span class="cx"> [shadowPathAnimation setToValue:(id)shadowPath.get()];
</span><span class="cx">
</span><del>- [shadowLayer addAnimation:shadowBoundsAnimation.get() forKey:@"transientZoomCommitShadowBounds"];
- [shadowLayer addAnimation:shadowPositionAnimation.get() forKey:@"transientZoomCommitShadowPosition"];
- [shadowLayer addAnimation:shadowPathAnimation.get() forKey:@"transientZoomCommitShadowPath"];
</del><ins>+ [shadowCALayer addAnimation:shadowBoundsAnimation.get() forKey:@"transientZoomCommitShadowBounds"];
+ [shadowCALayer addAnimation:shadowPositionAnimation.get() forKey:@"transientZoomCommitShadowPosition"];
+ [shadowCALayer addAnimation:shadowPathAnimation.get() forKey:@"transientZoomCommitShadowPath"];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [CATransaction commit];
</span><span class="lines">@@ -604,19 +621,14 @@
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingArea::applyTransientZoomToPage(double scale, FloatPoint origin)
</span><span class="cx"> {
</span><del>- RenderView* renderView = m_webPage->mainFrameView()->renderView();
- PlatformCALayer* renderViewLayer = toGraphicsLayerCA(renderView->layer()->backing()->graphicsLayer())->platformCALayer();
-
</del><ins>+ // If the page scale is already the target scale, setPageScaleFactor() will short-circuit
+ // and not apply the transform, so we can't depend on it to do so.
</ins><span class="cx"> TransformationMatrix finalTransform;
</span><span class="cx"> finalTransform.scale(scale);
</span><ins>+ layerForTransientZoom()->setTransform(finalTransform);
</ins><span class="cx">
</span><del>- // If the page scale is already the target scale, setPageScaleFactor() will short-circuit
- // and not apply the transform, so we can't depend on it to do so.
- renderViewLayer->setTransform(finalTransform);
-
- GraphicsLayerCA* shadowGraphicsLayer = toGraphicsLayerCA(renderView->compositor().layerForContentShadow());
- if (shadowGraphicsLayer) {
- PlatformCALayer* shadowLayer = shadowGraphicsLayer->platformCALayer();
</del><ins>+ if (PlatformCALayer* shadowLayer = shadowLayerForTransientZoom()) {
+ RenderView* renderView = m_webPage->mainFrameView()->renderView();
</ins><span class="cx"> IntRect overflowRect = renderView->pixelSnappedLayoutOverflowRect();
</span><span class="cx"> shadowLayer->setBounds(IntRect(IntPoint(), toIntSize(overflowRect.maxXMaxYCorner())));
</span><span class="cx"> shadowLayer->setPosition(shadowLayer->bounds().center());
</span></span></pre>
</div>
</div>
</body>
</html>