Move DIP translation from ui/aura to ui/compositor

ui/gfx/compositor/compositor.cc

 // Copyright (c) 2012 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 "ui/gfx/compositor/compositor.h"
 
 #include "base/command_line.h"
 #include "base/threading/thread_restrictions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/images/SkImageEncoder.h"
 #include "ui/gfx/compositor/compositor_observer.h"
 #include "ui/gfx/compositor/compositor_switches.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/compositor/dip_util.h"
 #include "ui/gfx/compositor/test_web_graphics_context_3d.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 namespace {
 
 const double kDefaultRefreshRate = 60.0;
@@ skipping 84 matching lines @@
 Texture::Texture(bool flipped, const gfx::Size& size)
     : texture_id_(0),
       flipped_(flipped),
       size_(size) {
 }
 
 Texture::~Texture() {
 }
 
 Compositor::Compositor(CompositorDelegate* delegate,
-                       gfx::AcceleratedWidget widget,
-                       const gfx::Size& size)
+                       gfx::AcceleratedWidget widget)
     : delegate_(delegate),
-      size_(size),
       root_layer_(NULL),
       widget_(widget),
       root_web_layer_(WebKit::WebLayer::create()),
-      swap_posted_(false) {
+      swap_posted_(false),
+      device_scale_factor_(0.0f) {
   WebKit::WebLayerTreeView::Settings settings;
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   settings.showFPSCounter =
       command_line->HasSwitch(switches::kUIShowFPSCounter);
   settings.showPlatformLayerTree =
       command_line->HasSwitch(switches::kUIShowLayerTree);
   settings.refreshRate = test_compositor_enabled ?
       kTestRefreshRate : kDefaultRefreshRate;
   settings.partialSwapEnabled =
       command_line->HasSwitch(switches::kUIEnablePartialSwap);
   settings.perTilePainting =
     command_line->HasSwitch(switches::kUIEnablePerTilePainting);
 
   host_.initialize(this, root_web_layer_, settings);
   root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
-  WidgetSizeChanged(size_);
 }
 
 Compositor::~Compositor() {
   // There's a cycle between |root_web_layer_| and |host_|, which results in
   // leaking and/or crashing. Explicitly set the root layer to NULL so the cycle
   // is broken.
   host_.setRootLayer(NULL);
   if (root_layer_)
     root_layer_->SetCompositor(NULL);
   if (!test_compositor_enabled)
@@ skipping 47 matching lines @@
   layout();
   host_.composite();
   if (!g_compositor_thread && !swap_posted_)
     NotifyEnd();
 }
 
 void Compositor::ScheduleFullDraw() {
   host_.setNeedsRedraw();
 }
 
-bool Compositor::ReadPixels(SkBitmap* bitmap, const gfx::Rect& bounds) {
-  if (bounds.right() > size().width() || bounds.bottom() > size().height())
+bool Compositor::ReadPixels(SkBitmap* bitmap,
+                            const gfx::Rect& bounds_in_pixel) {
+  if (bounds_in_pixel.right() > size().width() ||
+      bounds_in_pixel.bottom() > size().height())
     return false;
   // Convert to OpenGL coordinates.
-  gfx::Point new_origin(bounds.x(),
-                        size().height() - bounds.height() - bounds.y());
+  gfx::Point new_origin(
+      bounds_in_pixel.x(),
+      size().height() - bounds_in_pixel.height() - bounds_in_pixel.y());
 
   bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                    bounds.width(), bounds.height());
+                    bounds_in_pixel.width(), bounds_in_pixel.height());
   bitmap->allocPixels();
   SkAutoLockPixels lock_image(*bitmap);
   unsigned char* pixels = static_cast<unsigned char*>(bitmap->getPixels());
-  if (host_.compositeAndReadback(pixels,
-                                 gfx::Rect(new_origin, bounds.size()))) {
-    SwizzleRGBAToBGRAAndFlip(pixels, bounds.size());
+  if (host_.compositeAndReadback(
+          pixels, gfx::Rect(new_origin, bounds_in_pixel.size()))) {
+    SwizzleRGBAToBGRAAndFlip(pixels, bounds_in_pixel.size());
     return true;
   }
   return false;
 }
 
-void Compositor::WidgetSizeChanged(const gfx::Size& size) {
-  if (size.IsEmpty())
+void Compositor::WidgetScaleOrSizeChanged(float scale,
+                                          const gfx::Size& size_in_pixel) {
+  if (size_in_pixel.IsEmpty() || scale <= 0)
     return;
-  size_ = size;
-  host_.setViewportSize(size_);
-  root_web_layer_.setBounds(size_);
+  size_ = size_in_pixel;
+  host_.setViewportSize(size_in_pixel);
+  root_web_layer_.setBounds(size_in_pixel);
+
+  if (device_scale_factor_ != scale && IsDIPEnabled()) {
+    device_scale_factor_ = scale;
+    scale_translate_.matrix().set3x3(scale, 0, 0,
+                                     0, scale, 0,
+                                     0, 0, 1);
+    CHECK(scale_translate_.matrix().invert(
+        &invese_scale_translate_.matrix()));
+     if (root_layer_)

[piman, 2012/05/04 18:46:06]

nit: indentation?

+      root_layer_->UpdateLayerSize();
+  }
 }
 
 void Compositor::AddObserver(CompositorObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void Compositor::RemoveObserver(CompositorObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
@@ skipping 11 matching lines @@
   NotifyEnd();
 }
 
 void Compositor::OnSwapBuffersAborted() {
   if (swap_posted_) {
     swap_posted_ = false;
     NotifyEnd();
   }
 }
 
+Transform Compositor::GetTranslateTransform(
+    const Transform& transform,
+    const gfx::Point& offset) {
+  ui::Transform ret;
+  ret.ConcatTransform(invese_scale_translate_);

[piman, 2012/05/04 18:46:06]

nit: you probably want to start with ret=inverse_scale_translate_ and
concatenate the other transforms. It saves a trivial matrix multiply.

+  ret.ConcatTransform(transform);
+  ret.ConcatTranslate(offset.x(), offset.y());
+  ret.ConcatTransform(scale_translate_);
+  return ret;
+}
+
 void Compositor::updateAnimations(double frameBeginTime) {
 }
 
 void Compositor::layout() {
   if (root_layer_)
     root_layer_->SendDamagedRects();
 }
 
 void Compositor::applyScrollAndScale(const WebKit::WebSize& scrollDelta,
                                      float scaleFactor) {
@@ skipping 65 matching lines @@
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return test_compositor_enabled;
 }
 
 }  // namespace ui