Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

chrome/browser/extensions/extension_action.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 "chrome/browser/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/common/badge_util.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/icon_with_badge_image_source.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/rect.h"
@@ skipping 76 matching lines @@
 }
 
 const SkBitmap& ExtensionAction::IconAnimation::Apply(
     const SkBitmap& icon) const {
   DCHECK_GT(icon.width(), 0);
   DCHECK_GT(icon.height(), 0);
 
   if (!device_.get() ||
       (device_->width() != icon.width()) ||
       (device_->height() != icon.height())) {
-    device_.reset(new SkDevice(
+    device_.reset(new SkBitmapDevice(
       SkBitmap::kARGB_8888_Config, icon.width(), icon.height(), true));
   }
 
   SkCanvas canvas(device_.get());
   canvas.clear(SK_ColorWHITE);
   SkPaint paint;
   paint.setAlpha(CurrentValueBetween(0, 255));
   canvas.drawBitmap(icon, 0, 0, &paint);
   return device_->accessBitmap(false);
 }
@@ skipping 265 matching lines @@
   icon_animation->Start();
   // After the icon is finished fading in (plus some padding to handle random
   // timer delays), destroy it. We use a delayed task so that the Animation is
   // deleted even if it hasn't finished by the time the MessageLoop is
   // destroyed.
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DestroyIconAnimation, base::Passed(&icon_animation)),
       base::TimeDelta::FromMilliseconds(kIconFadeInDurationMs * 2));
 }