<!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>[168559] trunk/Source</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/168559">168559</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-05-09 17:08:28 -0700 (Fri, 09 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering[iOS]: Top bar on apple.com/support jiggles when the swoosh animates.
https://bugs.webkit.org/show_bug.cgi?id=132750
<rdar://problem/16803281>
Reviewed by Simon Fraser.
This patch ensures that GraphicsLayer and RemoteLayerBackingStore have the same dimensions.
Remove integral enclosing when we set the size on RemoteLayerBackingStore. It makes the layer's size
different from the backingstore when the passed value is fractional.
We scale and integral round this value to size the shareable bitmap later. Rounding ensures that
the final size value matches what we calculated at GraphicsLayerCA::updateGeometry()
Currently not testable.
Source/WebCore:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::updateGeometry):
(WebCore::GraphicsLayerCA::computePixelAlignment): include device scale factor to be able calculate the final content scale.
* platform/graphics/ca/GraphicsLayerCA.h:
Source/WebKit2:
* Shared/mac/RemoteLayerBackingStore.h:
(WebKit::RemoteLayerBackingStore::size):
* Shared/mac/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::ensureBackingStore):
(WebKit::RemoteLayerBackingStore::setNeedsDisplay): use enclosing here to ensure we cover the entire backing store.
(WebKit::RemoteLayerBackingStore::display):
(WebKit::RemoteLayerBackingStore::drawInContext):
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(WebKit::PlatformCALayerRemote::updateBackingStore):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoreh">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168558 => 168559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-10 00:06:51 UTC (rev 168558)
+++ trunk/Source/WebCore/ChangeLog 2014-05-10 00:08:28 UTC (rev 168559)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-05-09 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering[iOS]: Top bar on apple.com/support jiggles when the swoosh animates.
+ https://bugs.webkit.org/show_bug.cgi?id=132750
+ <rdar://problem/16803281>
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that GraphicsLayer and RemoteLayerBackingStore have the same dimensions.
+
+ Remove integral enclosing when we set the size on RemoteLayerBackingStore. It makes the layer's size
+ different from the backingstore when the passed value is fractional.
+ We scale and integral round this value to size the shareable bitmap later. Rounding ensures that
+ the final size value matches what we calculated at GraphicsLayerCA::updateGeometry()
+
+ Currently not testable.
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::updateGeometry):
+ (WebCore::GraphicsLayerCA::computePixelAlignment): include device scale factor to be able calculate the final content scale.
+ * platform/graphics/ca/GraphicsLayerCA.h:
+
</ins><span class="cx"> 2014-05-09 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> JSDOMWindow should disable property caching after a certain point
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (168558 => 168559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-05-10 00:06:51 UTC (rev 168558)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-05-10 00:08:28 UTC (rev 168559)
</span><span class="lines">@@ -1533,7 +1533,7 @@
</span><span class="cx"> FloatPoint3D scaledAnchorPoint;
</span><span class="cx"> FloatSize scaledSize;
</span><span class="cx"> FloatSize pixelAlignmentOffset;
</span><del>- computePixelAlignment(pageScaleFactor, positionRelativeToBase, scaledPosition, scaledSize, scaledAnchorPoint, pixelAlignmentOffset);
</del><ins>+ computePixelAlignment(pageScaleFactor * deviceScaleFactor(), positionRelativeToBase, scaledPosition, scaledSize, scaledAnchorPoint, pixelAlignmentOffset);
</ins><span class="cx">
</span><span class="cx"> FloatRect adjustedBounds(m_boundsOrigin - pixelAlignmentOffset, scaledSize);
</span><span class="cx">
</span><span class="lines">@@ -3429,10 +3429,10 @@
</span><span class="cx"> noteLayerPropertyChanged(GeometryChanged | ContentsScaleChanged | ContentsOpaqueChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsLayerCA::computePixelAlignment(float pageScaleFactor, const FloatPoint& positionRelativeToBase,
</del><ins>+void GraphicsLayerCA::computePixelAlignment(float contentsScale, const FloatPoint& positionRelativeToBase,
</ins><span class="cx"> FloatPoint& position, FloatSize& size, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const
</span><span class="cx"> {
</span><del>- if (isIntegral(pageScaleFactor) || !m_drawsContent || m_masksToBounds) {
</del><ins>+ if (isIntegral(contentsScale) || !m_drawsContent || m_masksToBounds) {
</ins><span class="cx"> position = m_position;
</span><span class="cx"> size = m_size;
</span><span class="cx"> anchorPoint = m_anchorPoint;
</span><span class="lines">@@ -3443,12 +3443,12 @@
</span><span class="cx"> FloatRect baseRelativeBounds(positionRelativeToBase, m_size);
</span><span class="cx"> FloatRect scaledBounds = baseRelativeBounds;
</span><span class="cx"> // Scale by the page scale factor to compute the screen-relative bounds.
</span><del>- scaledBounds.scale(pageScaleFactor);
</del><ins>+ scaledBounds.scale(contentsScale);
</ins><span class="cx"> // Round to integer boundaries.
</span><span class="cx"> FloatRect alignedBounds = enclosingIntRect(scaledBounds);
</span><span class="cx">
</span><span class="cx"> // Convert back to layer coordinates.
</span><del>- alignedBounds.scale(1 / pageScaleFactor);
</del><ins>+ alignedBounds.scale(1 / contentsScale);
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> // Epsilon is necessary to ensure that backing store size computation in CA, which involves integer truncation,
</span><span class="lines">@@ -3471,7 +3471,7 @@
</span><span class="cx"> if (alignedBounds.height())
</span><span class="cx"> anchorPointY = (baseRelativeBounds.height() * anchorPointY + alignmentOffset.height()) / alignedBounds.height();
</span><span class="cx">
</span><del>- anchorPoint = FloatPoint3D(anchorPointX, anchorPointY, m_anchorPoint.z() * pageScaleFactor);
</del><ins>+ anchorPoint = FloatPoint3D(anchorPointX, anchorPointY, m_anchorPoint.z() * contentsScale);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::noteSublayersChanged(ScheduleFlushOrNot scheduleFlush)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (168558 => 168559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-05-10 00:06:51 UTC (rev 168558)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-05-10 00:08:28 UTC (rev 168559)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> virtual void getDebugBorderInfo(Color&, float& width) const override;
</span><span class="cx"> virtual void dumpAdditionalProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const override;
</span><span class="cx">
</span><del>- void computePixelAlignment(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase,
</del><ins>+ void computePixelAlignment(float contentsScale, const FloatPoint& positionRelativeToBase,
</ins><span class="cx"> FloatPoint& position, FloatSize&, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const;
</span><span class="cx">
</span><span class="cx"> TransformationMatrix layerTransform(const FloatPoint& position, const TransformationMatrix* customTransform = 0) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168558 => 168559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-10 00:06:51 UTC (rev 168558)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-10 00:08:28 UTC (rev 168559)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-05-09 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering[iOS]: Top bar on apple.com/support jiggles when the swoosh animates.
+ https://bugs.webkit.org/show_bug.cgi?id=132750
+ <rdar://problem/16803281>
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that GraphicsLayer and RemoteLayerBackingStore have the same dimensions.
+
+ Remove integral enclosing when we set the size on RemoteLayerBackingStore. It makes the layer's size
+ different from the backingstore when the passed value is fractional.
+ We scale and integral round this value to size the shareable bitmap later. Rounding ensures that
+ the final size value matches what we calculated at GraphicsLayerCA::updateGeometry()
+
+ Currently not testable.
+
+ * Shared/mac/RemoteLayerBackingStore.h:
+ (WebKit::RemoteLayerBackingStore::size):
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ (WebKit::RemoteLayerBackingStore::ensureBackingStore):
+ (WebKit::RemoteLayerBackingStore::setNeedsDisplay): use enclosing here to ensure we cover the entire backing store.
+ (WebKit::RemoteLayerBackingStore::display):
+ (WebKit::RemoteLayerBackingStore::drawInContext):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (WebKit::PlatformCALayerRemote::updateBackingStore):
+
</ins><span class="cx"> 2014-05-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Set up the resize events
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h (168558 => 168559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2014-05-10 00:06:51 UTC (rev 168558)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2014-05-10 00:08:28 UTC (rev 168559)
</span><span class="lines">@@ -51,14 +51,14 @@
</span><span class="cx"> RemoteLayerBackingStore(RemoteLayerTreeContext*);
</span><span class="cx"> ~RemoteLayerBackingStore();
</span><span class="cx">
</span><del>- void ensureBackingStore(PlatformCALayerRemote*, WebCore::IntSize, float scale, bool acceleratesDrawing, bool isOpaque);
</del><ins>+ void ensureBackingStore(PlatformCALayerRemote*, WebCore::FloatSize, float scale, bool acceleratesDrawing, bool isOpaque);
</ins><span class="cx">
</span><span class="cx"> void setNeedsDisplay(const WebCore::IntRect);
</span><span class="cx"> void setNeedsDisplay();
</span><span class="cx">
</span><span class="cx"> bool display();
</span><span class="cx">
</span><del>- WebCore::IntSize size() const { return m_size; }
</del><ins>+ WebCore::FloatSize size() const { return m_size; }
</ins><span class="cx"> float scale() const { return m_scale; }
</span><span class="cx"> bool acceleratesDrawing() const { return m_acceleratesDrawing; }
</span><span class="cx"> bool isOpaque() const { return m_isOpaque; }
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> PlatformCALayerRemote* m_layer;
</span><span class="cx">
</span><del>- WebCore::IntSize m_size;
</del><ins>+ WebCore::FloatSize m_size;
</ins><span class="cx"> float m_scale;
</span><span class="cx"> bool m_isOpaque;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (168558 => 168559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-05-10 00:06:51 UTC (rev 168558)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-05-10 00:08:28 UTC (rev 168559)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> m_context->backingStoreWillBeDestroyed(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteLayerBackingStore::ensureBackingStore(PlatformCALayerRemote* layer, IntSize size, float scale, bool acceleratesDrawing, bool isOpaque)
</del><ins>+void RemoteLayerBackingStore::ensureBackingStore(PlatformCALayerRemote* layer, FloatSize size, float scale, bool acceleratesDrawing, bool isOpaque)
</ins><span class="cx"> {
</span><span class="cx"> if (m_layer == layer && m_size == size && m_scale == scale && m_acceleratesDrawing == acceleratesDrawing && m_isOpaque == isOpaque)
</span><span class="cx"> return;
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx">
</span><span class="cx"> void RemoteLayerBackingStore::setNeedsDisplay()
</span><span class="cx"> {
</span><del>- setNeedsDisplay(IntRect(IntPoint(), m_size));
</del><ins>+ setNeedsDisplay(IntRect(IntPoint(), expandedIntSize(m_size)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RemoteLayerBackingStore::display()
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> if (m_dirtyRegion.isEmpty() || m_size.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- IntRect layerBounds(IntPoint(), m_size);
</del><ins>+ IntRect layerBounds(IntPoint(), expandedIntSize(m_size));
</ins><span class="cx"> if (!hasFrontBuffer())
</span><span class="cx"> m_dirtyRegion.unite(layerBounds);
</span><span class="cx">
</span><span class="lines">@@ -192,9 +192,8 @@
</span><span class="cx">
</span><span class="cx"> FloatSize scaledSize = m_size;
</span><span class="cx"> scaledSize.scale(m_scale);
</span><del>- IntSize expandedScaledSize = expandedIntSize(scaledSize);
</del><ins>+ IntSize expandedScaledSize = roundedIntSize(scaledSize);
</ins><span class="cx"> IntRect expandedScaledLayerBounds(IntPoint(), expandedScaledSize);
</span><del>-
</del><span class="cx"> bool willPaintEntireBackingStore = m_dirtyRegion.contains(layerBounds);
</span><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> if (m_acceleratesDrawing) {
</span><span class="lines">@@ -240,8 +239,9 @@
</span><span class="cx">
</span><span class="cx"> void RemoteLayerBackingStore::drawInContext(GraphicsContext& context, CGImageRef backImage)
</span><span class="cx"> {
</span><del>- IntRect layerBounds(IntPoint(), m_size);
- IntRect scaledLayerBounds(IntPoint(), expandedIntSize(m_size * m_scale));
</del><ins>+ FloatSize scaledSize = m_size;
+ scaledSize.scale(m_scale);
+ IntRect scaledLayerBounds(IntPoint(), roundedIntSize(scaledSize));
</ins><span class="cx">
</span><span class="cx"> if (!m_isOpaque)
</span><span class="cx"> context.clearRect(scaledLayerBounds);
</span><span class="lines">@@ -267,9 +267,9 @@
</span><span class="cx"> // FIXME: find a consistent way to scale and snap dirty and CG clip rects.
</span><span class="cx"> for (const auto& rect : dirtyRects) {
</span><span class="cx"> FloatRect scaledRect(rect);
</span><del>- scaledRect.scale(m_scale, m_scale);
</del><ins>+ scaledRect.scale(m_scale);
</ins><span class="cx"> scaledRect = enclosingIntRect(scaledRect);
</span><del>- scaledRect.scale(1 / m_scale, 1 / m_scale);
</del><ins>+ scaledRect.scale(1 / m_scale);
</ins><span class="cx"> m_paintingRects.append(scaledRect);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (168558 => 168559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-05-10 00:06:51 UTC (rev 168558)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-05-10 00:08:28 UTC (rev 168559)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> if (!m_properties.backingStore)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_properties.backingStore->ensureBackingStore(this, expandedIntSize(m_properties.bounds.size()), m_properties.contentsScale, m_acceleratesDrawing, m_properties.opaque);
</del><ins>+ m_properties.backingStore->ensureBackingStore(this, m_properties.bounds.size(), m_properties.contentsScale, m_acceleratesDrawing, m_properties.opaque);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setNeedsDisplay(const FloatRect* rect)
</span></span></pre>
</div>
</div>
</body>
</html>