<!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>[167970] 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/167970">167970</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-04-29 16:53:57 -0700 (Tue, 29 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some PLATFORM(IOS) #ifdefs related to hasAcceleratedTouchScrolling()
https://bugs.webkit.org/show_bug.cgi?id=132353
Reviewed by Tim Horton & Darin Adler.
Minor cleanup and refactoring to remove #idefs.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollTo): No need for this #ifdef, usesCompositedScrolling()
gives the right answser already.
(WebCore::RenderLayer::visibleContentRectInternal): Use showsOverflowControls() to
avoid #ifdef.
(WebCore::RenderLayer::invalidateScrollbarRect): Ditto.
(WebCore::RenderLayer::invalidateScrollCornerRect): Ditto.
(WebCore::RenderLayer::verticalScrollbarWidth): Ditto.
(WebCore::RenderLayer::horizontalScrollbarHeight): Ditto.
(WebCore::RenderLayer::showsOverflowControls): Return false on iOS.
(WebCore::RenderLayer::paintOverflowControls): Ditto.
(WebCore::RenderLayer::calculateClipRects): Ditto.
* rendering/RenderLayer.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::layerOrAncestorIsTransformedOrUsingCompositedScrolling):
Just #ifdef in side of this function rather than having two similar functions.
(WebCore::RenderLayerBacking::shouldClipCompositedBounds):
(WebCore::hasNonZeroTransformOrigin):
(WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration): Use a local bool
to reduce #ifdefs.
(WebCore::layerOrAncestorIsTransformedOrScrolling): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167969 => 167970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-29 23:53:55 UTC (rev 167969)
+++ trunk/Source/WebCore/ChangeLog 2014-04-29 23:53:57 UTC (rev 167970)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2014-04-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Remove some PLATFORM(IOS) #ifdefs related to hasAcceleratedTouchScrolling()
+ https://bugs.webkit.org/show_bug.cgi?id=132353
+
+ Reviewed by Tim Horton & Darin Adler.
+
+ Minor cleanup and refactoring to remove #idefs.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollTo): No need for this #ifdef, usesCompositedScrolling()
+ gives the right answser already.
+ (WebCore::RenderLayer::visibleContentRectInternal): Use showsOverflowControls() to
+ avoid #ifdef.
+ (WebCore::RenderLayer::invalidateScrollbarRect): Ditto.
+ (WebCore::RenderLayer::invalidateScrollCornerRect): Ditto.
+ (WebCore::RenderLayer::verticalScrollbarWidth): Ditto.
+ (WebCore::RenderLayer::horizontalScrollbarHeight): Ditto.
+ (WebCore::RenderLayer::showsOverflowControls): Return false on iOS.
+ (WebCore::RenderLayer::paintOverflowControls): Ditto.
+ (WebCore::RenderLayer::calculateClipRects): Ditto.
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::layerOrAncestorIsTransformedOrUsingCompositedScrolling):
+ Just #ifdef in side of this function rather than having two similar functions.
+ (WebCore::RenderLayerBacking::shouldClipCompositedBounds):
+ (WebCore::hasNonZeroTransformOrigin):
+ (WebCore::RenderLayerBacking::updateGraphicsLayerConfiguration): Use a local bool
+ to reduce #ifdefs.
+ (WebCore::layerOrAncestorIsTransformedOrScrolling): Deleted.
+
+2014-04-29 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Remove Settings::compositedScrollingForFramesEnabled
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132352
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (167969 => 167970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-04-29 23:53:55 UTC (rev 167969)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-04-29 23:53:57 UTC (rev 167970)
</span><span class="lines">@@ -2364,11 +2364,7 @@
</span><span class="cx"> requiresRepaint = false;
</span><span class="cx">
</span><span class="cx"> // Just schedule a full repaint of our object.
</span><del>-#if PLATFORM(IOS)
- if (!hasAcceleratedTouchScrolling())
-#else
</del><span class="cx"> if (requiresRepaint)
</span><del>-#endif
</del><span class="cx"> renderer().repaintUsingContainer(repaintContainer, m_repaintRect);
</span><span class="cx">
</span><span class="cx"> // Schedule the scroll and scroll-related DOM events.
</span><span class="lines">@@ -2695,16 +2691,9 @@
</span><span class="cx"> {
</span><span class="cx"> int verticalScrollbarWidth = 0;
</span><span class="cx"> int horizontalScrollbarHeight = 0;
</span><del>- if (scrollbarInclusion == IncludeScrollbars) {
</del><ins>+ if (showsOverflowControls() && scrollbarInclusion == IncludeScrollbars) {
</ins><span class="cx"> verticalScrollbarWidth = (verticalScrollbar() && !verticalScrollbar()->isOverlayScrollbar()) ? verticalScrollbar()->width() : 0;
</span><span class="cx"> horizontalScrollbarHeight = (horizontalScrollbar() && !horizontalScrollbar()->isOverlayScrollbar()) ? horizontalScrollbar()->height() : 0;
</span><del>-
-#if PLATFORM(IOS)
- if (hasAcceleratedTouchScrolling()) {
- verticalScrollbarWidth = 0;
- horizontalScrollbarHeight = 0;
- }
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return IntRect(IntPoint(scrollXOffset(), scrollYOffset()),
</span><span class="lines">@@ -2924,11 +2913,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
- // No need to invalidate scrollbars if we're using accelerated scrolling.
- if (hasAcceleratedTouchScrolling())
</del><ins>+ if (!showsOverflowControls())
</ins><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (scrollbar == m_vBar.get()) {
</span><span class="cx"> if (GraphicsLayer* layer = layerForVerticalScrollbar()) {
</span><span class="lines">@@ -2960,11 +2946,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::invalidateScrollCornerRect(const IntRect& rect)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
- // No need to invalidate the scroll corner if we're using accelerated scrolling.
- if (hasAcceleratedTouchScrolling())
</del><ins>+ if (!showsOverflowControls())
</ins><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (GraphicsLayer* layer = layerForScrollCorner()) {
</span><span class="cx"> layer->setNeedsDisplayInRect(rect);
</span><span class="lines">@@ -3084,27 +3067,21 @@
</span><span class="cx">
</span><span class="cx"> int RenderLayer::verticalScrollbarWidth(OverlayScrollbarSizeRelevancy relevancy) const
</span><span class="cx"> {
</span><del>- if (!m_vBar || (m_vBar->isOverlayScrollbar() && (relevancy == IgnoreOverlayScrollbarSize || !m_vBar->shouldParticipateInHitTesting())))
</del><ins>+ if (!m_vBar
+ || !showsOverflowControls()
+ || (m_vBar->isOverlayScrollbar() && (relevancy == IgnoreOverlayScrollbarSize || !m_vBar->shouldParticipateInHitTesting())))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- if (hasAcceleratedTouchScrolling())
- return 0;
-#endif
-
</del><span class="cx"> return m_vBar->width();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderLayer::horizontalScrollbarHeight(OverlayScrollbarSizeRelevancy relevancy) const
</span><span class="cx"> {
</span><del>- if (!m_hBar || (m_hBar->isOverlayScrollbar() && (relevancy == IgnoreOverlayScrollbarSize || !m_hBar->shouldParticipateInHitTesting())))
</del><ins>+ if (!m_hBar
+ || !showsOverflowControls()
+ || (m_hBar->isOverlayScrollbar() && (relevancy == IgnoreOverlayScrollbarSize || !m_hBar->shouldParticipateInHitTesting())))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- if (hasAcceleratedTouchScrolling())
- return 0;
-#endif
-
</del><span class="cx"> return m_hBar->height();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3374,17 +3351,25 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RenderLayer::showsOverflowControls() const
+{
+#if PLATFORM(IOS)
+ // Don't render (custom) scrollbars if we have accelerated scrolling.
+ if (hasAcceleratedTouchScrolling())
+ return false;
+#endif
+
+ return true;
+}
+
</ins><span class="cx"> void RenderLayer::paintOverflowControls(GraphicsContext* context, const IntPoint& paintOffset, const IntRect& damageRect, bool paintingOverlayControls)
</span><span class="cx"> {
</span><span class="cx"> // Don't do anything if we have no overflow.
</span><span class="cx"> if (!renderer().hasOverflowClip())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- // Don't render (custom) scrollbars if we have accelerated scrolling.
- if (hasAcceleratedTouchScrolling())
</del><ins>+ if (!showsOverflowControls())
</ins><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Overlay scrollbars paint in a second pass through the layer tree so that they will paint
</span><span class="cx"> // on top of everything else. If this is the normal painting pass, paintingOverlayControls
</span><span class="lines">@@ -6425,15 +6410,14 @@
</span><span class="cx"> && !renderer().hasFilter()
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- && !hasAcceleratedTouchScrolling()
</del><ins>+ && !hasAcceleratedTouchScrolling()
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> && !renderer().hasBlendMode()
</span><span class="cx"> #endif
</span><span class="cx"> && !isTransparent()
</span><span class="cx"> && !needsCompositedScrolling()
</span><del>- && !renderer().style().hasFlowFrom()
- ;
</del><ins>+ && !renderer().style().hasFlowFrom();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::shouldBeSelfPaintingLayer() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (167969 => 167970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-04-29 23:53:55 UTC (rev 167969)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-04-29 23:53:57 UTC (rev 167970)
</span><span class="lines">@@ -458,8 +458,8 @@
</span><span class="cx"> bool requiresScrollBoundsOriginUpdate() const { return m_requiresScrollBoundsOriginUpdate; }
</span><span class="cx"> void setRequiresScrollBoundsOriginUpdate(bool requiresUpdate = true) { m_requiresScrollBoundsOriginUpdate = requiresUpdate; }
</span><span class="cx">
</span><ins>+ // Returns true when the layer could do touch scrolling, but doesn't look at whether there is actually scrollable overflow.
</ins><span class="cx"> bool hasAcceleratedTouchScrolling() const;
</span><del>-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> int verticalScrollbarWidth(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const;
</span><span class="lines">@@ -1058,6 +1058,8 @@
</span><span class="cx"> bool hasScrollableHorizontalOverflow() const;
</span><span class="cx"> bool hasScrollableVerticalOverflow() const;
</span><span class="cx">
</span><ins>+ bool showsOverflowControls() const;
+
</ins><span class="cx"> bool shouldBeNormalFlowOnly() const;
</span><span class="cx">
</span><span class="cx"> bool shouldBeSelfPaintingLayer() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (167969 => 167970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-04-29 23:53:55 UTC (rev 167969)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-04-29 23:53:57 UTC (rev 167970)
</span><span class="lines">@@ -400,37 +400,23 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static bool hasNonZeroTransformOrigin(const RenderObject& renderer)
-{
- const RenderStyle& style = renderer.style();
- return (style.transformOriginX().type() == Fixed && style.transformOriginX().value())
- || (style.transformOriginY().type() == Fixed && style.transformOriginY().value());
-}
-
-#if PLATFORM(IOS)
-// FIXME: We should merge the concept of RenderLayer::{hasAcceleratedTouchScrolling, needsCompositedScrolling}()
-// so that we can remove this iOS-specific variant.
-static bool layerOrAncestorIsTransformedOrScrolling(RenderLayer& layer)
-{
- for (RenderLayer* curr = &layer; curr; curr = curr->parent()) {
- if (curr->hasTransform() || curr->hasAcceleratedTouchScrolling())
- return true;
- }
-
- return false;
-}
-#else
</del><ins>+// FIXME: the hasAcceleratedTouchScrolling()/needsCompositedScrolling() concepts need to be merged.
</ins><span class="cx"> static bool layerOrAncestorIsTransformedOrUsingCompositedScrolling(RenderLayer& layer)
</span><span class="cx"> {
</span><span class="cx"> for (RenderLayer* curr = &layer; curr; curr = curr->parent()) {
</span><del>- if (curr->hasTransform() || curr->needsCompositedScrolling())
</del><ins>+ if (curr->hasTransform()
+#if PLATFORM(IOS)
+ || curr->hasAcceleratedTouchScrolling()
+#else
+ || curr->needsCompositedScrolling()
+#endif
+ )
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-#endif
-
</del><ins>+
</ins><span class="cx"> bool RenderLayerBacking::shouldClipCompositedBounds() const
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -442,13 +428,8 @@
</span><span class="cx"> if (m_usingTiledCacheLayer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> if (layerOrAncestorIsTransformedOrUsingCompositedScrolling(m_owningLayer))
</span><span class="cx"> return false;
</span><del>-#else
- if (layerOrAncestorIsTransformedOrScrolling(m_owningLayer))
- return false;
-#endif
</del><span class="cx">
</span><span class="cx"> if (m_owningLayer.isFlowThreadCollectingGraphicsLayersUnderRegions())
</span><span class="cx"> return false;
</span><span class="lines">@@ -456,6 +437,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool hasNonZeroTransformOrigin(const RenderObject& renderer)
+{
+ const RenderStyle& style = renderer.style();
+ return (style.transformOriginX().type() == Fixed && style.transformOriginX().value())
+ || (style.transformOriginY().type() == Fixed && style.transformOriginY().value());
+}
+
</ins><span class="cx"> void RenderLayerBacking::updateCompositedBounds()
</span><span class="cx"> {
</span><span class="cx"> LayoutRect layerBounds = compositor().calculateCompositedBounds(m_owningLayer, m_owningLayer);
</span><span class="lines">@@ -548,16 +536,16 @@
</span><span class="cx"> layerConfigChanged = true;
</span><span class="cx">
</span><span class="cx"> bool needsDescendentsClippingLayer = compositor().clipsCompositingDescendants(m_owningLayer);
</span><del>-
</del><ins>+ bool usesCompositedScrolling;
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- // Our scrolling layer will clip.
- if (m_owningLayer.hasAcceleratedTouchScrolling())
- needsDescendentsClippingLayer = false;
</del><ins>+ usesCompositedScrolling = m_owningLayer.hasAcceleratedTouchScrolling();
</ins><span class="cx"> #else
</span><ins>+ usesCompositedScrolling = m_owningLayer.needsCompositedScrolling();
+#endif
+
</ins><span class="cx"> // Our scrolling layer will clip.
</span><del>- if (m_owningLayer.needsCompositedScrolling())
</del><ins>+ if (usesCompositedScrolling)
</ins><span class="cx"> needsDescendentsClippingLayer = false;
</span><del>-#endif // PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> if (updateAncestorClippingLayer(compositor().clippedByAncestor(m_owningLayer)))
</span><span class="cx"> layerConfigChanged = true;
</span><span class="lines">@@ -568,13 +556,8 @@
</span><span class="cx"> if (updateOverflowControlsLayers(requiresHorizontalScrollbarLayer(), requiresVerticalScrollbarLayer(), requiresScrollCornerLayer()))
</span><span class="cx"> layerConfigChanged = true;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- if (updateScrollingLayers(m_owningLayer.hasAcceleratedTouchScrolling()))
</del><ins>+ if (updateScrollingLayers(usesCompositedScrolling))
</ins><span class="cx"> layerConfigChanged = true;
</span><del>-#else
- if (updateScrollingLayers(m_owningLayer.needsCompositedScrolling()))
- layerConfigChanged = true;
-#endif // PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> if (layerConfigChanged)
</span><span class="cx"> updateInternalHierarchy();
</span></span></pre>
</div>
</div>
</body>
</html>