Apply viewport to dip scale to Graphics2D, Compositor

content/renderer/pepper/pepper_compositor_host.cc

 // Copyright 2014 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 "content/renderer/pepper/pepper_compositor_host.h"
 
 #include <stddef.h>
 #include <limits>
 #include <utility>
 
@@ skipping 12 matching lines @@
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/ppb_image_data_impl.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "third_party/khronos/GLES2/gl2.h"
+#include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/transform.h"
 
 using ppapi::host::HostMessageContext;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_ImageData_API;
 
 namespace content {
 
 namespace {
 
@@ skipping 172 matching lines @@
   commit_layers_reply_context_ = ppapi::host::ReplyMessageContext();
 }
 
 void PepperCompositorHost::UpdateLayer(
     const scoped_refptr<cc::Layer>& layer,
     const ppapi::CompositorLayerData* old_layer,
     const ppapi::CompositorLayerData* new_layer,
     std::unique_ptr<base::SharedMemory> image_shm) {
   // Always update properties on cc::Layer, because cc::Layer
   // will ignore any setting with unchanged value.
+  gfx::SizeF size(PP_ToGfxSize(new_layer->common.size));
+  gfx::RectF clip_rect(PP_ToGfxRect(new_layer->common.clip_rect));
+
+  // Pepper API uses DIP, so we must scale the layer's coordinates to
+  // viewport in use-zoom-for-dsf.
+  float dip_to_viewport_scale = 1 / viewport_to_dip_scale_;
+  size.Scale(dip_to_viewport_scale);
+  clip_rect.Scale(dip_to_viewport_scale);
+
   layer->SetIsDrawable(true);
   layer->SetBlendMode(SkXfermode::kSrcOver_Mode);
   layer->SetOpacity(new_layer->common.opacity);
-  layer->SetBounds(PP_ToGfxSize(new_layer->common.size));
-  layer->SetTransformOrigin(gfx::Point3F(new_layer->common.size.width / 2,
-                                         new_layer->common.size.height / 2,
-                                         0.0f));
 
+  layer->SetBounds(gfx::ToRoundedSize(size));
+  layer->SetTransformOrigin(
+      gfx::Point3F(size.width() / 2, size.height() / 2, 0.0f));
   gfx::Transform transform(gfx::Transform::kSkipInitialization);
   transform.matrix().setColMajorf(new_layer->common.transform.matrix);
   layer->SetTransform(transform);
 
   // Consider a (0,0,0,0) rect as no clip rect.
   if (new_layer->common.clip_rect.point.x != 0 ||
       new_layer->common.clip_rect.point.y != 0 ||
       new_layer->common.clip_rect.size.width != 0 ||
       new_layer->common.clip_rect.size.height != 0) {
     scoped_refptr<cc::Layer> clip_parent = layer->parent();
     if (clip_parent.get() == layer_.get()) {
       // Create a clip parent layer, if it does not exist.
       clip_parent = cc::Layer::Create();
       clip_parent->SetMasksToBounds(true);
       clip_parent->SetIsDrawable(true);
       layer_->ReplaceChild(layer.get(), clip_parent);
       clip_parent->AddChild(layer);
     }
-    auto position =
-        gfx::PointF(PP_ToGfxPoint(new_layer->common.clip_rect.point));
+    auto position = clip_rect.origin();
     clip_parent->SetPosition(position);
-    clip_parent->SetBounds(PP_ToGfxSize(new_layer->common.clip_rect.size));
+    clip_parent->SetBounds(gfx::ToRoundedSize(clip_rect.size()));
     layer->SetPosition(gfx::PointF(-position.x(), -position.y()));
   } else if (layer->parent() != layer_.get()) {
     // Remove the clip parent layer.
     layer_->ReplaceChild(layer->parent(), layer);
     layer->SetPosition(gfx::PointF());
   }
 
   if (new_layer->color) {
     layer->SetBackgroundColor(SkColorSetARGBMacro(
         new_layer->color->alpha * 255,
@@ skipping 142 matching lines @@
 
   // If the host is not bound to the instance, return PP_OK immediately.
   if (!bound_instance_)
     return PP_OK;
 
   commit_layers_reply_context_ = context->MakeReplyMessageContext();
   return PP_OK_COMPLETIONPENDING;
 }
 
 }  // namespace content