<!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>[169046] trunk/Source/WebCore</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/169046">169046</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-19 08:53:37 -0700 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use RenderStyle& in more places in RenderLayerBacking
https://bugs.webkit.org/show_bug.cgi?id=133061
Reviewed by Andreas Kling.
Convert several member functions to use references to RenderStyle rather
than pointers. Move canCreateTiledImage() higher in the file (no code
changes). Other minor cleanup.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
(WebCore::RenderLayerBacking::updateOpacity):
(WebCore::RenderLayerBacking::updateTransform):
(WebCore::RenderLayerBacking::updateFilters):
(WebCore::RenderLayerBacking::updateBlendMode):
(WebCore::RenderLayerBacking::updateGeometry):
(WebCore::hasBoxDecorations):
(WebCore::canCreateTiledImage):
(WebCore::hasBoxDecorationsOrBackgroundImage):
(WebCore::hasPerspectiveOrPreserves3D):
(WebCore::supportsDirectBoxDecorationsComposition):
(WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
(WebCore::RenderLayerBacking::contentChanged):
(WebCore::RenderLayerBacking::startTransition):
* rendering/RenderLayerBacking.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169045 => 169046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-19 15:53:32 UTC (rev 169045)
+++ trunk/Source/WebCore/ChangeLog 2014-05-19 15:53:37 UTC (rev 169046)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-05-18 Simon Fraser <simon.fraser@apple.com>
+
+ Use RenderStyle& in more places in RenderLayerBacking
+ https://bugs.webkit.org/show_bug.cgi?id=133061
+
+ Reviewed by Andreas Kling.
+
+ Convert several member functions to use references to RenderStyle rather
+ than pointers. Move canCreateTiledImage() higher in the file (no code
+ changes). Other minor cleanup.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+ (WebCore::RenderLayerBacking::updateOpacity):
+ (WebCore::RenderLayerBacking::updateTransform):
+ (WebCore::RenderLayerBacking::updateFilters):
+ (WebCore::RenderLayerBacking::updateBlendMode):
+ (WebCore::RenderLayerBacking::updateGeometry):
+ (WebCore::hasBoxDecorations):
+ (WebCore::canCreateTiledImage):
+ (WebCore::hasBoxDecorationsOrBackgroundImage):
+ (WebCore::hasPerspectiveOrPreserves3D):
+ (WebCore::supportsDirectBoxDecorationsComposition):
+ (WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
+ (WebCore::RenderLayerBacking::contentChanged):
+ (WebCore::RenderLayerBacking::startTransition):
+ * rendering/RenderLayerBacking.h:
+
</ins><span class="cx"> 2014-05-17 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename some RenderLayerBacking member functions
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (169045 => 169046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-05-19 15:53:32 UTC (rev 169045)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-05-19 15:53:37 UTC (rev 169046)
</span><span class="lines">@@ -73,9 +73,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-static bool hasBoxDecorationsOrBackgroundImage(const RenderStyle*);
-static LayoutRect clipBox(RenderBox& renderer);
-
</del><span class="cx"> CanvasCompositingStrategy canvasCompositingStrategy(const RenderObject& renderer)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(renderer.isCanvas());
</span><span class="lines">@@ -316,13 +313,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- updateOpacity(&renderer().style());
- updateTransform(&renderer().style());
</del><ins>+ updateOpacity(renderer().style());
+ updateTransform(renderer().style());
</ins><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- updateFilters(&renderer().style());
</del><ins>+ updateFilters(renderer().style());
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- updateBlendMode(&renderer().style());
</del><ins>+ updateBlendMode(renderer().style());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -357,19 +354,19 @@
</span><span class="cx"> m_scrollingContentsLayer = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerBacking::updateOpacity(const RenderStyle* style)
</del><ins>+void RenderLayerBacking::updateOpacity(const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- m_graphicsLayer->setOpacity(compositingOpacity(style->opacity()));
</del><ins>+ m_graphicsLayer->setOpacity(compositingOpacity(style.opacity()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerBacking::updateTransform(const RenderStyle* style)
</del><ins>+void RenderLayerBacking::updateTransform(const RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: This could use m_owningLayer.transform(), but that currently has transform-origin
</span><span class="cx"> // baked into it, and we don't want that.
</span><span class="cx"> TransformationMatrix t;
</span><span class="cx"> if (m_owningLayer.hasTransform()) {
</span><span class="cx"> RenderBox& renderBox = toRenderBox(renderer());
</span><del>- style->applyTransform(t, pixelSnappedForPainting(renderBox.borderBoxRect(), renderBox.document().deviceScaleFactor()), RenderStyle::ExcludeTransformOrigin);
</del><ins>+ style.applyTransform(t, pixelSnappedForPainting(renderBox.borderBoxRect(), renderBox.document().deviceScaleFactor()), RenderStyle::ExcludeTransformOrigin);
</ins><span class="cx"> makeMatrixRenderable(t, compositor().canRender3DTransforms());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -381,20 +378,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>-void RenderLayerBacking::updateFilters(const RenderStyle* style)
</del><ins>+void RenderLayerBacking::updateFilters(const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- m_canCompositeFilters = m_graphicsLayer->setFilters(style->filter());
</del><ins>+ m_canCompositeFilters = m_graphicsLayer->setFilters(style.filter());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>-void RenderLayerBacking::updateBlendMode(const RenderStyle* style)
</del><ins>+void RenderLayerBacking::updateBlendMode(const RenderStyle& style)
</ins><span class="cx"> {
</span><ins>+ // FIXME: where is the blend mode updated when m_ancestorClippingLayers come and go?
</ins><span class="cx"> if (m_ancestorClippingLayer) {
</span><del>- m_ancestorClippingLayer->setBlendMode(style->blendMode());
</del><ins>+ m_ancestorClippingLayer->setBlendMode(style.blendMode());
</ins><span class="cx"> m_graphicsLayer->setBlendMode(BlendModeNormal);
</span><span class="cx"> } else
</span><del>- m_graphicsLayer->setBlendMode(style->blendMode());
</del><ins>+ m_graphicsLayer->setBlendMode(style.blendMode());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -653,21 +651,23 @@
</span><span class="cx"> if (m_owningLayer.isStackingContainer() && m_owningLayer.m_zOrderListsDirty)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ const RenderStyle& style = renderer().style();
+
</ins><span class="cx"> // Set transform property, if it is not animating. We have to do this here because the transform
</span><span class="cx"> // is affected by the layer dimensions.
</span><span class="cx"> if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(&renderer(), CSSPropertyWebkitTransform, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
</span><del>- updateTransform(&renderer().style());
</del><ins>+ updateTransform(style);
</ins><span class="cx">
</span><span class="cx"> // Set opacity, if it is not animating.
</span><span class="cx"> if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(&renderer(), CSSPropertyOpacity, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
</span><del>- updateOpacity(&renderer().style());
</del><ins>+ updateOpacity(style);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- updateFilters(&renderer().style());
</del><ins>+ updateFilters(style);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- updateBlendMode(&renderer().style());
</del><ins>+ updateBlendMode(style);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool isSimpleContainer = isSimpleContainerCompositingLayer();
</span><span class="lines">@@ -679,7 +679,6 @@
</span><span class="cx"> // non-compositing visible layers.
</span><span class="cx"> m_graphicsLayer->setContentsVisible(m_owningLayer.hasVisibleContent() || hasVisibleNonCompositingDescendantLayers());
</span><span class="cx">
</span><del>- const RenderStyle& style = renderer().style();
</del><span class="cx"> // FIXME: reflections should force transform-style to be flat in the style: https://bugs.webkit.org/show_bug.cgi?id=106959
</span><span class="cx"> bool preserves3D = style.transformStyle3D() == TransformStyle3DPreserve3D && !renderer().hasReflection();
</span><span class="cx"> m_graphicsLayer->setPreserves3D(preserves3D);
</span><span class="lines">@@ -844,7 +843,6 @@
</span><span class="cx"> else
</span><span class="cx"> m_graphicsLayer->setAnchorPoint(anchor);
</span><span class="cx">
</span><del>- const RenderStyle& style = renderer().style();
</del><span class="cx"> GraphicsLayer* clipLayer = clippingLayer();
</span><span class="cx"> if (style.hasPerspective()) {
</span><span class="cx"> TransformationMatrix t = owningLayer().perspectiveTransform();
</span><span class="lines">@@ -1511,27 +1509,57 @@
</span><span class="cx"> return finalOpacity;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool hasBoxDecorations(const RenderStyle* style)
</del><ins>+static inline bool hasBoxDecorations(const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- return style->hasBorder() || style->hasBorderRadius() || style->hasOutline() || style->hasAppearance() || style->boxShadow() || style->hasFilter();
</del><ins>+ return style.hasBorder() || style.hasBorderRadius() || style.hasOutline() || style.hasAppearance() || style.boxShadow() || style.hasFilter();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static bool canCreateTiledImage(const RenderStyle*);
</del><ins>+static bool canCreateTiledImage(const RenderStyle& style)
+{
+ const FillLayer* fillLayer = style.backgroundLayers();
+ if (fillLayer->next())
+ return false;
</ins><span class="cx">
</span><del>-static bool hasBoxDecorationsOrBackgroundImage(const RenderStyle* style)
</del><ins>+ if (!fillLayer->imagesAreLoaded())
+ return false;
+
+ if (fillLayer->attachment() != ScrollBackgroundAttachment)
+ return false;
+
+ Color color = style.visitedDependentColor(CSSPropertyBackgroundColor);
+
+ // FIXME: Allow color+image compositing when it makes sense.
+ // For now bailing out.
+ if (color.isValid() && color.alpha())
+ return false;
+
+ StyleImage* styleImage = fillLayer->image();
+
+ // FIXME: support gradients with isGeneratedImage.
+ if (!styleImage->isCachedImage())
+ return false;
+
+ Image* image = styleImage->cachedImage()->image();
+ if (!image->isBitmapImage())
+ return false;
+
+ return true;
+}
+
+static bool hasBoxDecorationsOrBackgroundImage(const RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> if (hasBoxDecorations(style))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (!style->hasBackgroundImage())
</del><ins>+ if (!style.hasBackgroundImage())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return !GraphicsLayer::supportsContentsTiling() || !canCreateTiledImage(style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool hasPerspectiveOrPreserves3D(const RenderStyle* style)
</del><ins>+static inline bool hasPerspectiveOrPreserves3D(const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- return style->hasPerspective() || style->preserves3D();
</del><ins>+ return style.hasPerspective() || style.preserves3D();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color RenderLayerBacking::rendererBackgroundColor() const
</span><span class="lines">@@ -1557,38 +1585,6 @@
</span><span class="cx"> didUpdateContentsRect = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool canCreateTiledImage(const RenderStyle* style)
-{
- const FillLayer* fillLayer = style->backgroundLayers();
- if (fillLayer->next())
- return false;
-
- if (!fillLayer->imagesAreLoaded())
- return false;
-
- if (fillLayer->attachment() != ScrollBackgroundAttachment)
- return false;
-
- Color color = style->visitedDependentColor(CSSPropertyBackgroundColor);
-
- // FIXME: Allow color+image compositing when it makes sense.
- // For now bailing out.
- if (color.isValid() && color.alpha())
- return false;
-
- StyleImage* styleImage = fillLayer->image();
-
- // FIXME: support gradients with isGeneratedImage.
- if (!styleImage->isCachedImage())
- return false;
-
- Image* image = styleImage->cachedImage()->image();
- if (!image->isBitmapImage())
- return false;
-
- return true;
-}
-
</del><span class="cx"> void RenderLayerBacking::updateDirectlyCompositedBackgroundImage(bool isSimpleContainer, bool& didUpdateContentsRect)
</span><span class="cx"> {
</span><span class="cx"> if (!GraphicsLayer::supportsContentsTiling())
</span><span class="lines">@@ -1643,10 +1639,11 @@
</span><span class="cx"> if (!GraphicsLayer::supportsBackgroundColorContent())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ const RenderStyle& style = renderer.style();
</ins><span class="cx"> if (renderer.hasClip())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (hasBoxDecorationsOrBackgroundImage(&renderer.style()))
</del><ins>+ if (hasBoxDecorationsOrBackgroundImage(style))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // FIXME: We can't create a directly composited background if this
</span><span class="lines">@@ -1654,14 +1651,14 @@
</span><span class="cx"> // A better solution might be to introduce a flattening layer if
</span><span class="cx"> // we do direct box decoration composition.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=119461
</span><del>- if (hasPerspectiveOrPreserves3D(&renderer.style()))
</del><ins>+ if (hasPerspectiveOrPreserves3D(style))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // FIXME: we should be able to allow backgroundComposite; However since this is not a common use case it has been deferred for now.
</span><del>- if (renderer.style().backgroundComposite() != CompositeSourceOver)
</del><ins>+ if (style.backgroundComposite() != CompositeSourceOver)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (renderer.style().backgroundClip() == TextFillBox)
</del><ins>+ if (style.backgroundClip() == TextFillBox)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -1729,11 +1726,9 @@
</span><span class="cx"> if (!rootObject)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderStyle* style = &rootObject->style();
-
</del><span class="cx"> // Reject anything that has a border, a border-radius or outline,
</span><span class="cx"> // or is not a simple background (no background, or solid color).
</span><del>- if (hasBoxDecorationsOrBackgroundImage(style))
</del><ins>+ if (hasBoxDecorationsOrBackgroundImage(rootObject->style()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Now look at the body's renderer.
</span><span class="lines">@@ -1742,9 +1737,7 @@
</span><span class="cx"> if (!bodyObject)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- style = &bodyObject->style();
-
- if (hasBoxDecorationsOrBackgroundImage(style))
</del><ins>+ if (hasBoxDecorationsOrBackgroundImage(bodyObject->style()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1860,7 +1853,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ((changeType == BackgroundImageChanged) && canCreateTiledImage(&renderer().style()))
</del><ins>+ if ((changeType == BackgroundImageChanged) && canCreateTiledImage(renderer().style()))
</ins><span class="cx"> updateGeometry();
</span><span class="cx">
</span><span class="cx"> if ((changeType == MaskImageChanged) && m_maskLayer) {
</span><span class="lines">@@ -2416,7 +2409,7 @@
</span><span class="cx"> // The boxSize param is only used for transform animations (which can only run on RenderBoxes), so we pass an empty size here.
</span><span class="cx"> if (m_graphicsLayer->addAnimation(opacityVector, FloatSize(), opacityAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyOpacity), timeOffset)) {
</span><span class="cx"> // To ensure that the correct opacity is visible when the animation ends, also set the final opacity.
</span><del>- updateOpacity(toStyle);
</del><ins>+ updateOpacity(*toStyle);
</ins><span class="cx"> didAnimate = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2430,7 +2423,7 @@
</span><span class="cx"> transformVector.insert(TransformAnimationValue::create(1, toStyle->transform()));
</span><span class="cx"> if (m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer()).pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitTransform), timeOffset)) {
</span><span class="cx"> // To ensure that the correct transform is visible when the animation ends, also set the final transform.
</span><del>- updateTransform(toStyle);
</del><ins>+ updateTransform(*toStyle);
</ins><span class="cx"> didAnimate = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2445,7 +2438,7 @@
</span><span class="cx"> filterVector.insert(FilterAnimationValue::create(1, toStyle->filter()));
</span><span class="cx"> if (m_graphicsLayer->addAnimation(filterVector, FloatSize(), filterAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitFilter), timeOffset)) {
</span><span class="cx"> // To ensure that the correct filter is visible when the animation ends, also set the final filter.
</span><del>- updateFilters(toStyle);
</del><ins>+ updateFilters(*toStyle);
</ins><span class="cx"> didAnimate = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (169045 => 169046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-05-19 15:53:32 UTC (rev 169045)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-05-19 15:53:37 UTC (rev 169046)
</span><span class="lines">@@ -251,13 +251,13 @@
</span><span class="cx"> // Result is transform origin in device pixels.
</span><span class="cx"> FloatPoint3D computeTransformOriginForPainting(const LayoutRect& borderBox) const;
</span><span class="cx">
</span><del>- void updateOpacity(const RenderStyle*);
- void updateTransform(const RenderStyle*);
</del><ins>+ void updateOpacity(const RenderStyle&);
+ void updateTransform(const RenderStyle&);
</ins><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><del>- void updateFilters(const RenderStyle*);
</del><ins>+ void updateFilters(const RenderStyle&);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- void updateBlendMode(const RenderStyle*);
</del><ins>+ void updateBlendMode(const RenderStyle&);
</ins><span class="cx"> #endif
</span><span class="cx"> // Return the opacity value that this layer should use for compositing.
</span><span class="cx"> float compositingOpacity(float rendererOpacity) const;
</span></span></pre>
</div>
</div>
</body>
</html>