ash: Access the Canvas for painting through PaintRecorder.

ash/wm/dock/docked_window_layout_manager.cc

 // Copyright (c) 2013 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 "ash/wm/dock/docked_window_layout_manager.h"
 
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 14 matching lines @@
 #include "grit/ash_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/paint_context.h"
+#include "ui/compositor/paint_recorder.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/background.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
@@ skipping 42 matching lines @@
       UpdateBackground();
   }
 
   // views::Widget:
   void OnNativeWidgetVisibilityChanged(bool visible) override {
     views::Widget::OnNativeWidgetVisibilityChanged(visible);
     UpdateBackground();
   }
 
   void OnNativeWidgetPaint(const ui::PaintContext& context) override {
-    gfx::Canvas* canvas = context.canvas();
+    ui::PaintRecorder recorder(context);
     const gfx::ImageSkia& shelf_background(
         alignment_ == DOCKED_ALIGNMENT_LEFT ?
             shelf_background_left_ : shelf_background_right_);
     gfx::Rect rect = gfx::Rect(GetWindowBoundsInScreen().size());
     SkPaint paint;
     paint.setAlpha(alpha_);
-    canvas->DrawImageInt(shelf_background,
-                         0,
-                         0,
-                         shelf_background.width(),
-                         shelf_background.height(),
-                         alignment_ == DOCKED_ALIGNMENT_LEFT
-                             ? rect.width() - shelf_background.width()
-                             : 0,
-                         0,
-                         shelf_background.width(),
-                         rect.height(),
-                         false,
-                         paint);
-    canvas->DrawImageInt(
+    recorder.canvas()->DrawImageInt(
+        shelf_background, 0, 0, shelf_background.width(),
+        shelf_background.height(), alignment_ == DOCKED_ALIGNMENT_LEFT
+                                       ? rect.width() - shelf_background.width()
+                                       : 0,
+        0, shelf_background.width(), rect.height(), false, paint);
+    recorder.canvas()->DrawImageInt(
         shelf_background,
         alignment_ == DOCKED_ALIGNMENT_LEFT ? 0 : shelf_background.width() - 1,
-        0,
-        1,
-        shelf_background.height(),
-        alignment_ == DOCKED_ALIGNMENT_LEFT ? 0 : shelf_background.width(),
-        0,
-        rect.width() - shelf_background.width(),
-        rect.height(),
-        false,
-        paint);
+        0, 1, shelf_background.height(),
+        alignment_ == DOCKED_ALIGNMENT_LEFT ? 0 : shelf_background.width(), 0,
+        rect.width() - shelf_background.width(), rect.height(), false, paint);
   }
 
   // BackgroundAnimatorDelegate:
   void UpdateBackground(int alpha) override {
     alpha_ = alpha;
     SchedulePaintInRect(gfx::Rect(GetWindowBoundsInScreen().size()));
   }
 
  private:
   void InitWidget(aura::Window* parent) {
@@ skipping 1225 matching lines @@
 
 void DockedWindowLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& keyboard_bounds) {
   // This bounds change will have caused a change to the Shelf which does not
   // propagate automatically to this class, so manually recalculate bounds.
   Relayout();
   UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING);
 }
 
 }  // namespace ash