Move page scale ownership to LayerTreeImpl.

cc/layer_tree_host.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer_tree_host.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 281 matching lines @@
         syncTree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>(LayerTreeHostCommon::findLayerInSubtree(syncTree->RootLayer(), m_hudLayer->id())));
     else
         syncTree->set_hud_layer(0);
 
     syncTree->set_source_frame_number(commitNumber());
     syncTree->set_background_color(m_backgroundColor);
     syncTree->set_has_transparent_background(m_hasTransparentBackground);
 
     syncTree->FindRootScrollLayer();
 
+    if (m_settings.implSidePainting) {

[danakj, 2013/01/28 20:29:03]

how about pulling out the appropriate page_scale_delta and sent_page_scale_delta
into variables based on if. Then the syncTree->set() stuff can be
non-conditional.

[aelias_OOO_until_Jul13, 2013/01/29 06:05:14]

Done.

+        DCHECK_EQ(1, syncTree->sent_page_scale_delta());
+        syncTree->SetPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor);
+        syncTree->SetPageScaleDelta(hostImpl->activeTree()->page_scale_delta() / hostImpl->activeTree()->sent_page_scale_delta());

[danakj, 2013/01/28 20:29:03]

Can you add a comment here similar to the scroll code to explain this is due to
the active layer doing stuff before the pending layer was created?

That said, is this still true and needed in either place now that we sync the
pending tree instead of recreating it?

[enne (OOO), 2013/01/28 21:03:46]

Yeah, this will still be needed given that we don't sync updates to the recycle
tree (i.e. the pending tree post-activation).  Maybe that assumption should
change, but that's the state of the code now.

[aelias_OOO_until_Jul13, 2013/01/29 06:05:14]

Added comment.

+    } else {
+        syncTree->SetPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor);
+        syncTree->SetPageScaleDelta(syncTree->page_scale_delta() / syncTree->sent_page_scale_delta());
+        syncTree->set_sent_page_scale_delta(1);
+    }
+#if 0
+    if (layer->layerTreeImpl()->settings().implSidePainting) {
+        DCHECK(layer->layerTreeImpl()->IsPendingTree());
+        LayerImpl* active_twin = layer->layerTreeImpl()->FindActiveTreeLayerById(id());
+        // Update the scroll delta from the active layer, which may have
+        // adjusted its scroll delta prior to this pending layer being created.
+        // This code is identical to that in LayerImpl::setScrollDelta.
+        if (active_twin) {
+            DCHECK(layer->sentScrollDelta().IsZero());
+            layer->setScrollDelta(active_twin->scrollDelta() - active_twin->sentScrollDelta());
+        }
+    } else {
+        layer->setScrollDelta(layer->scrollDelta() - layer->sentScrollDelta());
+        layer->setSentScrollDelta(gfx::Vector2d());
+    }
+#endif
+
     if (!m_settings.implSidePainting) {
         // If we're not in impl-side painting, the tree is immediately
         // considered active.
         syncTree->DidBecomeActive();
     }
 
     hostImpl->setViewportSize(layoutViewportSize(), deviceViewportSize());
     hostImpl->setDeviceScaleFactor(deviceScaleFactor());
-    hostImpl->setPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor);
     hostImpl->setDebugState(m_debugState);
     hostImpl->savePaintTime(m_renderingStats.totalPaintTime);
 
     if (newImplTreeHasNoEvictedResources) {
         if (syncTree->ContentsTexturesPurged())
             syncTree->ResetContentsTexturesPurged();
     }
 
     m_commitNumber++;
 }
@@ skipping 529 matching lines @@
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 skia::RefPtr<SkPicture> LayerTreeHost::capturePicture()
 {
     return m_proxy->capturePicture();
 }
 
 }  // namespace cc