Use ScopedRTLFlipCanvas more pervasively for RTL flipping.

chrome/browser/ui/views/download/download_item_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/download/download_item_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 34 matching lines @@
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::DownloadItem;
 using extensions::ExperienceSamplingEvent;
@@ skipping 631 matching lines @@
         file_name_color =
             color_utils::AlphaBlend(SK_ColorBLACK, file_name_color, 255 / 5);
       }
       canvas->DrawStringRect(status_text_, font_list_, file_name_color,
                              gfx::Rect(mirrored_x, y, kTextWidth,
                                        font_list_.GetHeight()));
     }
   }
 
   // Paint the background images.
-  int x = kLeftPadding;
-  canvas->Save();
-  if (base::i18n::IsRTL()) {
-    // Since we do not have the mirrored images for
-    // (hot_)body_image_set->top_left, (hot_)body_image_set->left,
-    // (hot_)body_image_set->bottom_left, and drop_down_image_set,
-    // for RTL UI, we flip the canvas to draw those images mirrored.
-    // Consequently, we do not need to mirror the x-axis of those images.
-    canvas->Translate(gfx::Vector2d(width(), 0));
-    canvas->Scale(-1, 1);
-  }
-  PaintImages(canvas,
-              body_image_set->top_left, body_image_set->left,
-              body_image_set->bottom_left,
-              x, box_y_, box_height_, body_image_set->top_left->width());
-  x += body_image_set->top_left->width();
-  PaintImages(canvas,
-              body_image_set->top, body_image_set->center,
-              body_image_set->bottom,
-              x, box_y_, box_height_, center_width);
-  x += center_width;
-  PaintImages(canvas,
-              body_image_set->top_right, body_image_set->right,
-              body_image_set->bottom_right,
-              x, box_y_, box_height_, body_image_set->top_right->width());
-
-  // Overlay our body hot state. Warning dialogs don't display body a hot state.
-  if (!IsShowingWarningDialog() &&
-      body_hover_animation_->GetCurrentValue() > 0) {
-    canvas->SaveLayerAlpha(
-        static_cast<int>(body_hover_animation_->GetCurrentValue() * 255));
+  {
+    gfx::ScopedRTLFlipCanvas scoped_canvas(canvas, width());

[Peter Kasting, 2016/08/18 23:40:41]

This file looks as if it's changed a lot, but it's a case of the diff tool
matching up the wrong lines.  The PaintImages() calls are actually in the same
places as before.

So what's actually changed here is that the Save() call and IsRtl() conditional
are gone, and then the Restore() at the very end is gone too.  Everything else
is just indented one more level due to scoping |scoped_canvas|.

 
     int x = kLeftPadding;
     PaintImages(canvas,
-                hot_body_image_set_.top_left, hot_body_image_set_.left,
-                hot_body_image_set_.bottom_left,
-                x, box_y_, box_height_, hot_body_image_set_.top_left->width());
+                body_image_set->top_left, body_image_set->left,
+                body_image_set->bottom_left,
+                x, box_y_, box_height_, body_image_set->top_left->width());
     x += body_image_set->top_left->width();
     PaintImages(canvas,
-                hot_body_image_set_.top, hot_body_image_set_.center,
-                hot_body_image_set_.bottom,
+                body_image_set->top, body_image_set->center,
+                body_image_set->bottom,
                 x, box_y_, box_height_, center_width);
     x += center_width;
     PaintImages(canvas,
-                hot_body_image_set_.top_right, hot_body_image_set_.right,
-                hot_body_image_set_.bottom_right,
-                x, box_y_, box_height_,
-                hot_body_image_set_.top_right->width());
-    canvas->Restore();
-  }
+                body_image_set->top_right, body_image_set->right,
+                body_image_set->bottom_right,
+                x, box_y_, box_height_, body_image_set->top_right->width());
 
-  x += body_image_set->top_right->width();
+    // Overlay our body hot state. Warning dialogs don't display body a hot
+    // state.
+    if (!IsShowingWarningDialog() &&
+        body_hover_animation_->GetCurrentValue() > 0) {
+      canvas->SaveLayerAlpha(
+          static_cast<int>(body_hover_animation_->GetCurrentValue() * 255));
 
-  // Paint the drop-down.
-  if (drop_down_image_set) {
-    PaintImages(canvas,
-                drop_down_image_set->top, drop_down_image_set->center,
-                drop_down_image_set->bottom,
-                x, box_y_, box_height_, drop_down_image_set->top->width());
+      int x = kLeftPadding;
+      PaintImages(canvas,
+                  hot_body_image_set_.top_left, hot_body_image_set_.left,
+                  hot_body_image_set_.bottom_left,
+                  x, box_y_, box_height_,
+                  hot_body_image_set_.top_left->width());
+      x += body_image_set->top_left->width();
+      PaintImages(canvas,
+                  hot_body_image_set_.top, hot_body_image_set_.center,
+                  hot_body_image_set_.bottom,
+                  x, box_y_, box_height_, center_width);
+      x += center_width;
+      PaintImages(canvas,
+                  hot_body_image_set_.top_right, hot_body_image_set_.right,
+                  hot_body_image_set_.bottom_right,
+                  x, box_y_, box_height_,
+                  hot_body_image_set_.top_right->width());
+      canvas->Restore();
+    }
 
-    // Overlay our drop-down hot state.
-    if (drop_hover_animation_->GetCurrentValue() > 0) {
-      canvas->SaveLayerAlpha(
-          static_cast<int>(drop_hover_animation_->GetCurrentValue() * 255));
+    x += body_image_set->top_right->width();
 
+    // Paint the drop-down.
+    if (drop_down_image_set) {
       PaintImages(canvas,
                   drop_down_image_set->top, drop_down_image_set->center,
                   drop_down_image_set->bottom,
                   x, box_y_, box_height_, drop_down_image_set->top->width());
 
-      canvas->Restore();
+      // Overlay our drop-down hot state.
+      if (drop_hover_animation_->GetCurrentValue() > 0) {
+        canvas->SaveLayerAlpha(
+            static_cast<int>(drop_hover_animation_->GetCurrentValue() * 255));
+
+        PaintImages(canvas,
+                    drop_down_image_set->top, drop_down_image_set->center,
+                    drop_down_image_set->bottom,
+                    x, box_y_, box_height_, drop_down_image_set->top->width());
+
+        canvas->Restore();
+      }
     }
   }
 
-  // Restore the canvas to avoid file name etc. text are drawn flipped.
-  // Consequently, the x-axis of following canvas->DrawXXX() method should be
-  // mirrored so the text and images are down in the right positions.
-  canvas->Restore();
-
   // Print the text, left aligned and always print the file extension.
   // Last value of x was the end of the right image, just before the button.
   // Note that in dangerous mode we use a label (as the text is multi-line).
   if (!IsShowingWarningDialog()) {
     base::string16 filename;
     if (!disabled_while_opening_) {
       filename = gfx::ElideFilename(download()->GetFileNameToReportUser(),
                                    font_list_, kTextWidth);
     } else {
       // First, Calculate the download status opening string width.
@@ skipping 558 matching lines @@
     animation->Reset((to == HOT) ? 1.0 : 0.0);
   }
 }
 
 void DownloadItemView::ProgressTimerFired() {
   // Only repaint for the indeterminate size case. Otherwise, we'll repaint only
   // when there's an update notified via OnDownloadUpdated().
   if (model_.PercentComplete() < 0)
     SchedulePaint();
 }