Chromium compositor change implementing page-scale driven pinch-zoom.

cc/CCLayerTreeHost.cpp

 // 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 "config.h"
 
 #include "CCLayerTreeHost.h"
 
 #include "CCFontAtlas.h"
 #include "CCGraphicsContext.h"
@@ skipping 444 matching lines @@
     if (layoutViewportSize().isEmpty())
         return;
 
     m_contentsTextureManager->setMaxMemoryLimitBytes(memoryAllocationLimitBytes);
 
     updateLayers(rootLayer(), queue);
 }
 
 static void setScale(LayerChromium* layer, float deviceScaleFactor, float pageScaleFactor)
 {
-    if (layer->boundsContainPageScale())
+    if (false /*layer->boundsContainPageScale()*/)

[enne (OOO), 2012/09/13 19:40:54]

I assume this can go away once with the corresponding NCCH changes on the WebKit
bug?

[Jeff Timanus, 2012/09/13 19:58:50]

Yes, this hack can go away once the NCCH change in wk has landed.

         layer->setContentsScale(deviceScaleFactor);
     else
         layer->setContentsScale(deviceScaleFactor * pageScaleFactor);
 }
 
 static void updateLayerScale(LayerChromium* layer, float deviceScaleFactor, float pageScaleFactor)
 {
     setScale(layer, deviceScaleFactor, pageScaleFactor);
 
     LayerChromium* maskLayer = layer->maskLayer();
@@ skipping 296 matching lines @@
             else
                 layer->notifyAnimationFinished(wallClockTime);
         }
     }
 
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 } // namespace WebCore