gfx: Rename canvas SaveAndUnscale to UnscaleTheDeviceScaleFactor.

chrome/browser/ui/views/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 65 matching lines @@
 #include "ui/base/page_transition_types.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/button_drag_utils.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/label.h"
 #include "ui/views/drag_utils.h"
@@ skipping 374 matching lines @@
   canvas->sk_canvas()->drawRect(rc_down, paint_down);
 }
 
 class BookmarkBarView::ButtonSeparatorView : public views::View {
  public:
   ButtonSeparatorView() {}
   ~ButtonSeparatorView() override {}
 
   void OnPaint(gfx::Canvas* canvas) override {
     if (ui::MaterialDesignController::IsModeMaterial()) {
+      gfx::ScopedCanvas scoped_canvas(canvas);
       // 1px wide at all scale factors. If there is an uneven amount of padding
       // left over, place the extra pixel on the outside, i.e. away from the
       // "Other bookmarks" folder.
-      const float scale = canvas->SaveAndUnscale();
+      const float scale = canvas->UndoDeviceScaleFactor();
       const gfx::RectF scaled_bounds =
           gfx::ScaleRect(gfx::RectF(bounds()), scale);
 
       const int kLineThickness = 1;
       const float fractional_x = (scaled_bounds.width() - kLineThickness) / 2.f;
       const int x = base::i18n::IsRTL() ? std::floor(fractional_x)
                                         : std::ceil(fractional_x);
 
       const int height = gfx::kFaviconSize * scale;
       const int top_y = (scaled_bounds.height() - height) / 2;
       canvas->DrawLine(
           gfx::Point(x, top_y), gfx::Point(x, top_y + height),
           SkColorSetA(GetThemeProvider()->GetColor(
                           ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON),
                       0x4D));
-      canvas->Restore();
     } else {
       PaintVerticalDivider(
           canvas, kSeparatorStartX, height(), 1, kEdgeDividerColor,
           kMiddleDividerColor,
           GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR));
     }
   }
 
   gfx::Size GetPreferredSize() const override {
     // We get the full height of the bookmark bar, so that the height returned
@@ skipping 1579 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }