Make delegated software renderer work on Mac

content/browser/compositor/software_output_device_win.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/browser/compositor/software_output_device_win.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/compositor/compositor.h"
@@ skipping 11 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   LONG style = GetWindowLong(hwnd_, GWL_EXSTYLE);
   is_hwnd_composited_ = !!(style & WS_EX_COMPOSITED);
 }
 
 SoftwareOutputDeviceWin::~SoftwareOutputDeviceWin() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
-void SoftwareOutputDeviceWin::Resize(const gfx::Size& viewport_size) {
+void SoftwareOutputDeviceWin::Resize(const gfx::Size& viewport_pixel_size,
+                                     float scale_factor) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (viewport_size_ == viewport_size)
+  scale_factor_ = scale_factor;
+
+  if (viewport_pixel_size_ == viewport_pixel_size)
     return;
 
-  viewport_size_ = viewport_size;
-  contents_.reset(new gfx::Canvas(viewport_size, 1.0f, true));
+  viewport_pixel_size_ = viewport_pixel_size;
+  contents_.reset(new gfx::Canvas(viewport_pixel_size, 1.0f, true));
   memset(&bitmap_info_, 0, sizeof(bitmap_info_));
-  gfx::CreateBitmapHeader(viewport_size_.width(), viewport_size_.height(),
+  gfx::CreateBitmapHeader(viewport_pixel_size_.width(),
+                          viewport_pixel_size_.height(),
                           &bitmap_info_.bmiHeader);
 }
 
 SkCanvas* SoftwareOutputDeviceWin::BeginPaint(const gfx::Rect& damage_rect) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(contents_);
 
   damage_rect_ = damage_rect;
   return contents_ ? contents_->sk_canvas() : NULL;
 }
 
 void SoftwareOutputDeviceWin::EndPaint(cc::SoftwareFrameData* frame_data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(contents_);
   DCHECK(frame_data);
 
   if (!contents_)
     return;
 
   SoftwareOutputDevice::EndPaint(frame_data);
 
   gfx::Rect rect = damage_rect_;
-  rect.Intersect(gfx::Rect(viewport_size_));
+  rect.Intersect(gfx::Rect(viewport_pixel_size_));
   if (rect.IsEmpty())
     return;
 
   SkCanvas* canvas = contents_->sk_canvas();
   DCHECK(canvas);
   if (is_hwnd_composited_) {
     RECT wr;
     GetWindowRect(hwnd_, &wr);
     SIZE size = {wr.right - wr.left, wr.bottom - wr.top};
     POINT position = {wr.left, wr.top};
@@ skipping 19 matching lines @@
 
 void SoftwareOutputDeviceWin::CopyToPixels(const gfx::Rect& rect,
                                            void* pixels) {
   DCHECK(contents_);
   SkImageInfo info = SkImageInfo::MakeN32Premul(rect.width(), rect.height());
   contents_->sk_canvas()->readPixels(
       info, pixels, info.minRowBytes(), rect.x(), rect.y());
 }
 
 }  // namespace content