views: Access the Canvas through recorders not through PaintContext.

chrome/browser/ui/views/infobars/infobar_view.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/ui/views/infobars/infobar_view.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/infobar_container_delegate.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar_delegate.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/compositor/clip_transform_recorder.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
@@ skipping 204 matching lines @@
   const int kMinimumVerticalPadding = 6;
   int height = InfoBarContainerDelegate::kDefaultBarTargetHeight;
   for (int i = 0; i < child_count(); ++i) {
     const int child_height = child_at(i)->height();
     height = std::max(height, child_height + kMinimumVerticalPadding);
   }
   SetBarTargetHeight(height);
 }
 
 void InfoBarView::PaintChildren(const ui::PaintContext& context) {
-  gfx::Canvas* canvas = context.canvas();
-  canvas->Save();
-
   // TODO(scr): This really should be the |fill_path_|, but the clipPath seems
   // broken on non-Windows platforms (crbug.com/75154). For now, just clip to
   // the bar bounds.
   //
   // canvas->sk_canvas()->clipPath(fill_path_);
   DCHECK_EQ(total_height(), height())
       << "Infobar piecewise heights do not match overall height";
-  canvas->ClipRect(gfx::Rect(0, arrow_height(), width(), bar_height()));
+  ui::ClipTransformRecorder clip_transform_recorder(context);
+  clip_transform_recorder.ClipRect(
+      gfx::Rect(0, arrow_height(), width(), bar_height()));
   views::View::PaintChildren(context);
-  canvas->Restore();
 }
 
 void InfoBarView::ButtonPressed(views::Button* sender,
                                 const ui::Event& event) {
   if (!owner())
     return;  // We're closing; don't call anything, it might access the owner.
   if (sender == close_button_) {
     delegate()->InfoBarDismissed();
     RemoveSelf();
   }
@@ skipping 112 matching lines @@
 void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) {
   views::ExternalFocusTracker::OnWillChangeFocus(focused_before, focused_now);
 
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
   if (focused_before && focused_now && !Contains(focused_before) &&
       Contains(focused_now)) {
     NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }