Plumb preferred raster bounds rather than scale

third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 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 92 matching lines @@
                                       client->isTrackingRasterInvalidations()),
       m_paintingPhase(GraphicsLayerPaintAllWithOverflowClip),
       m_parent(0),
       m_maskLayer(0),
       m_contentsClippingMaskLayer(0),
       m_paintCount(0),
       m_contentsLayer(0),
       m_contentsLayerId(0),
       m_scrollableArea(nullptr),
       m_renderingContext3d(0),
-      m_preferredRasterScale(1.0f),
-      m_hasPreferredRasterScale(false) {
+      m_hasPreferredRasterBounds(false) {
 #if ENABLE(ASSERT)
   if (m_client)
     m_client->verifyNotPainting();
 #endif
 
   m_contentLayerDelegate = wrapUnique(new ContentLayerDelegate(this));
   m_layer = Platform::current()->compositorSupport()->createContentLayer(
       m_contentLayerDelegate.get());
   m_layer->layer()->setDrawsContent(m_drawsContent && m_contentsVisible);
   m_layer->layer()->setLayerClient(this);
@@ skipping 19 matching lines @@
 LayoutRect GraphicsLayer::visualRect() const {
   LayoutRect bounds = LayoutRect(FloatPoint(), size());
   bounds.move(offsetFromLayoutObjectWithSubpixelAccumulation());
   return bounds;
 }
 
 void GraphicsLayer::setHasWillChangeTransformHint(bool hasWillChangeTransform) {
   m_layer->layer()->setHasWillChangeTransformHint(hasWillChangeTransform);
 }
 
-void GraphicsLayer::setPreferredRasterScale(float preferredRasterScale) {
-  m_preferredRasterScale = preferredRasterScale;
-  m_hasPreferredRasterScale = true;
-  m_layer->layer()->setPreferredRasterScale(preferredRasterScale);
+void GraphicsLayer::setPreferredRasterBounds(const IntSize& bounds) {
+  m_preferredRasterBounds = bounds;
+  m_hasPreferredRasterBounds = true;
+  m_layer->layer()->setPreferredRasterBounds(bounds);
 }
 
-void GraphicsLayer::clearPreferredRasterScale() {
-  m_preferredRasterScale = 1.0f;
-  m_hasPreferredRasterScale = false;
-  m_layer->layer()->clearPreferredRasterScale();
+void GraphicsLayer::clearPreferredRasterBounds() {
+  m_preferredRasterBounds = IntSize();
+  m_hasPreferredRasterBounds = false;
+  m_layer->layer()->clearPreferredRasterBounds();
 }
 
 void GraphicsLayer::setParent(GraphicsLayer* layer) {
   ASSERT(!layer || !layer->hasAncestor(this));
   m_parent = layer;
 }
 
 #if ENABLE(ASSERT)
 
 bool GraphicsLayer::hasAncestor(GraphicsLayer* ancestor) const {
@@ skipping 506 matching lines @@
   if (m_drawsContent)
     json->setBoolean("drawsContent", m_drawsContent);
 
   if (!m_contentsVisible)
     json->setBoolean("contentsVisible", m_contentsVisible);
 
   if (!m_backfaceVisibility)
     json->setString("backfaceVisibility",
                     m_backfaceVisibility ? "visible" : "hidden");
 
-  if (m_hasPreferredRasterScale)
-    json->setDouble("preferredRasterScale", m_preferredRasterScale);
+  if (m_hasPreferredRasterBounds) {
+    json->setArray("preferredRasterBounds",
+                   sizeAsJSONArray(m_preferredRasterBounds));
+  }
 
   if (flags & LayerTreeIncludesDebugInfo)
     json->setString("client", pointerAsString(m_client));
 
   if (m_backgroundColor.alpha())
     json->setString("backgroundColor",
                     m_backgroundColor.nameForLayoutTreeAsText());
 
   if (!m_transform.isIdentity())
     json->setArray("transform", transformAsJSONArray(m_transform));
@@ skipping 588 matching lines @@
 void showGraphicsLayerTree(const blink::GraphicsLayer* layer) {
   if (!layer) {
     fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n");
     return;
   }
 
   String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
   fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif