(Not ready for review!) Toolbar and views high dpi support.

ui/gfx/skbitmap_operations.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/skbitmap_operations.h"
 
 #include <algorithm>
 #include <string.h>
 
 #include "base/logging.h"
@@ skipping 115 matching lines @@
       dst_row[x] = SkColorSetARGB(a, r, g, b);
     }
   }
 
   return blended;
 }
 
 // static
 SkBitmap SkBitmapOperations::CreateMaskedBitmap(const SkBitmap& rgb,
                                                 const SkBitmap& alpha) {
-  DCHECK(rgb.width() == alpha.width());
-  DCHECK(rgb.height() == alpha.height());
+ // DCHECK(rgb.width() == alpha.width());
+ // DCHECK(rgb.height() == alpha.height());
   DCHECK(rgb.bytesPerPixel() == alpha.bytesPerPixel());
   DCHECK(rgb.config() == SkBitmap::kARGB_8888_Config);
   DCHECK(alpha.config() == SkBitmap::kARGB_8888_Config);
 
   SkBitmap masked;
-  masked.setConfig(SkBitmap::kARGB_8888_Config, rgb.width(), rgb.height(), 0);
+  masked.setConfig(SkBitmap::kARGB_8888_Config,
+    std::min(rgb.width(), alpha.width()),
+    std::min(rgb.height(), alpha.height()), 0);
   masked.allocPixels();
   masked.eraseARGB(0, 0, 0, 0);
 
   SkAutoLockPixels lock_rgb(rgb);
   SkAutoLockPixels lock_alpha(alpha);
   SkAutoLockPixels lock_masked(masked);
 
   for (int y = 0; y < masked.height(); ++y) {
     uint32* rgb_row = rgb.getAddr32(0, y);
     uint32* alpha_row = alpha.getAddr32(0, y);
@@ skipping 688 matching lines @@
   canvas.translate(SkFloatToScalar(result.width() * 0.5f),
                    SkFloatToScalar(result.height() * 0.5f));
   canvas.rotate(angle);
   canvas.translate(-SkFloatToScalar(source.width() * 0.5f),
                    -SkFloatToScalar(source.height() * 0.5f));
   canvas.drawBitmap(source, 0, 0);
   canvas.flush();
 
   return result;
 }