Changeset 165233 in webkit

Timestamp:

Mar 6, 2014, 5:31:53 PM (12 years ago)

Author:

Simon Fraser

Message:

Minor optimization in ScrollingTreeScrollingNodeMac
​https://bugs.webkit.org/show_bug.cgi?id=129848

Reviewed by Dean Jackson.

No need to call scrollOffsetForFixedPosition() again if we don't have header
and footer layers.

• page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:

(WebCore::ScrollingTreeScrollingNodeMac::setScrollLayerPosition):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Minor optimization in ScrollingTreeScrollingNodeMac
+        https://bugs.webkit.org/show_bug.cgi?id=129848
+
+        Reviewed by Dean Jackson.
+
+        No need to call scrollOffsetForFixedPosition() again if we don't have header
+        and footer layers.
+
+        * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+        (WebCore::ScrollingTreeScrollingNodeMac::setScrollLayerPosition):
+
 2014-03-06  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm

@@ -349 +349 @@
         m_counterScrollingLayer.get().position = FloatPoint(scrollOffsetForFixedChildren);
 
-    // Generally the banners should have the same horizontal-position computation as a fixed element. However,
-    // the banners are not affected by the frameScaleFactor(), so if there is currently a non-1 frameScaleFactor()
-    // then we should recompute scrollOffsetForFixedChildren for the banner with a scale factor of 1.
-    float horizontalScrollOffsetForBanner = scrollOffsetForFixedChildren.width();
-    if (frameScaleFactor() != 1)
-        horizontalScrollOffsetForBanner = FrameView::scrollOffsetForFixedPosition(enclosingIntRect(viewportConstrainedObjectRect()), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), 1, false, behaviorForFixed, headerHeight(), footerHeight()).width();
-
-    if (m_headerLayer)
-        m_headerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, 0);
-
-    if (m_footerLayer)
-        m_footerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, totalContentsSize().height() - footerHeight());
+    if (m_headerLayer || m_footerLayer) {
+        // Generally the banners should have the same horizontal-position computation as a fixed element. However,
+        // the banners are not affected by the frameScaleFactor(), so if there is currently a non-1 frameScaleFactor()
+        // then we should recompute scrollOffsetForFixedChildren for the banner with a scale factor of 1.
+        float horizontalScrollOffsetForBanner = scrollOffsetForFixedChildren.width();
+        if (frameScaleFactor() != 1)
+            horizontalScrollOffsetForBanner = FrameView::scrollOffsetForFixedPosition(enclosingIntRect(viewportConstrainedObjectRect()), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), 1, false, behaviorForFixed, headerHeight(), footerHeight()).width();
+
+        if (m_headerLayer)
+            m_headerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, 0);
+
+        if (m_footerLayer)
+            m_footerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, totalContentsSize().height() - footerHeight());
+    }
 
     FloatRect viewportRect = viewportConstrainedObjectRect();