Not for review - Rebase of crrev.com/62833003

Source/core/rendering/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 784 matching lines @@
             m_overflowControlsClippingLayer->setOffsetFromRenderer(m_ancestorClippingLayer->offsetFromRenderer());
             m_overflowControlsClippingLayer->setMasksToBounds(true);
 
             m_overflowControlsHostLayer->setPosition(IntPoint(-m_overflowControlsClippingLayer->offsetFromRenderer()));
         } else {
             // The controls are in the same 2D space as the compositing container, so we can map them into the space of the container.
             TransformState transformState(TransformState::ApplyTransformDirection, FloatPoint());
             m_owningLayer.renderer()->mapLocalToContainer(compositingStackingContext->renderer(), transformState, ApplyContainerFlip);
             transformState.flatten();
             LayoutPoint offsetFromStackingContainer = LayoutPoint(transformState.lastPlanarPoint());
+            if (RenderLayerScrollableArea* scrollableArea = compositingStackingContext->scrollableArea())
+                offsetFromStackingContainer.move(LayoutSize(scrollableArea->adjustedScrollOffset()));
             m_overflowControlsHostLayer->setPosition(FloatPoint(offsetFromStackingContainer));
         }
     } else {
         m_overflowControlsHostLayer->setPosition(FloatPoint());
     }
 }
 
 void CompositedLayerMapping::updateChildContainmentLayerGeometry(const IntRect& clippingBox, const IntRect& localCompositingBounds)
 {
     if (!m_childContainmentLayer)
@@ skipping 336 matching lines @@
     // FIXME: Remove the flooredIntSize conversion. crbug.com/414283.
     const IntPoint position = blockSelectionGapsBounds.location() + flooredIntSize(m_owningLayer.scrollableArea()->adjustedScrollOffset());
     if (m_scrollingBlockSelectionLayer->size() == blockSelectionGapsBounds.size() && m_scrollingBlockSelectionLayer->position() == position)
         return;
 
     m_scrollingBlockSelectionLayer->setPosition(position);
     m_scrollingBlockSelectionLayer->setSize(blockSelectionGapsBounds.size());
     m_scrollingBlockSelectionLayer->setOffsetFromRenderer(toIntSize(blockSelectionGapsBounds.location()), GraphicsLayer::SetNeedsDisplay);
 }
 
+void CompositedLayerMapping::unbindAnimatedProperties()
+{
+    TRACE_EVENT0("teleport", "CompositedLayerMapping::unbindAnimatedProperties");
+    m_graphicsLayer->clearAnimatedProperties();
+    if (m_scrollingContentsLayer)
+        m_scrollingContentsLayer->clearAnimatedProperties();
+}
+
+void CompositedLayerMapping::bindAnimatedProperties(const Vector<String>& properties)
+{
+    TRACE_EVENT0("teleport", "CompositedLayerMapping::bindAnimatedProperties");
+    for (size_t i = 0; i < properties.size(); ++i) {
+        const String& property = properties[i];
+        // TODO(vollick): this seems to be repeated a bunch. Can it be consolidated?
+        Vector<String> components;
+        property.split(":", components);
+        if (components[1] == "scrollTop" || components[1] == "pendingScrollDelta") {
+            if (m_scrollingContentsLayer)
+                m_scrollingContentsLayer->addAnimatedProperty(property);
+        } else {
+            m_graphicsLayer->addAnimatedProperty(property);
+        }
+    }
+}
+
 void CompositedLayerMapping::updateDrawsContent()
 {
     bool hasPaintedContent = containsPaintedContent();
     m_graphicsLayer->setDrawsContent(hasPaintedContent);
 
     if (m_scrollingLayer) {
         // m_scrollingLayer never has backing store.
         // m_scrollingContentsLayer only needs backing store if the scrolled contents need to paint.
         m_scrollingContentsAreEmpty = !m_owningLayer.hasVisibleContent() || !(renderer()->hasBackground() || paintsChildren());
         m_scrollingContentsLayer->setDrawsContent(!paintsIntoCompositedAncestor() && !m_scrollingContentsAreEmpty);
@@ skipping 1202 matching lines @@
     } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) {
         name = "Scrolling Block Selection Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink