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();
 
+    float page_scale_delta, sent_page_scale_delta;
+    if (m_settings.implSidePainting) {
+        // Update the delta from the active tree, which may have
+        // adjusted its delta prior to the pending tree being created.
+        // This code is equivalent to that in LayerTreeImpl::SetPageScaleDelta.
+        DCHECK_EQ(1, syncTree->sent_page_scale_delta());
+        page_scale_delta = hostImpl->activeTree()->page_scale_delta();
+        sent_page_scale_delta = hostImpl->activeTree()->sent_page_scale_delta();
+    } else {
+        page_scale_delta = syncTree->page_scale_delta();
+        sent_page_scale_delta = syncTree->sent_page_scale_delta();
+        syncTree->set_sent_page_scale_delta(1);
+    }
+
+    syncTree->SetPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor);
+    syncTree->SetPageScaleDelta(page_scale_delta / sent_page_scale_delta);
+
     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