cros: Fix browser header wrongly drawn frame image

ui/gfx/canvas.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 "ui/gfx/canvas.h"
 
 #include <cmath>
 #include <limits>
 
 #include "base/i18n/rtl.h"
@@ skipping 472 matching lines @@
                           int h) {
   TileImageInt(image, 0, 0, x, y, w, h);
 }
 
 void Canvas::TileImageInt(const ImageSkia& image,
                           int src_x,
                           int src_y,
                           int dest_x,
                           int dest_y,
                           int w,
-                          int h) {
-  TileImageInt(image, src_x, src_y, 1.0f, 1.0f, dest_x, dest_y, w, h);
-}
-
-void Canvas::TileImageInt(const ImageSkia& image,
-                          int src_x,
-                          int src_y,
-                          float tile_scale_x,
-                          float tile_scale_y,
-                          int dest_x,
-                          int dest_y,
-                          int w,
-                          int h) {
+                          int h,
+                          cc::PaintFlags* flags) {
   SkRect dest_rect = { SkIntToScalar(dest_x),
                        SkIntToScalar(dest_y),
                        SkIntToScalar(dest_x + w),
                        SkIntToScalar(dest_y + h) };
   if (!IntersectsClipRect(dest_rect))
     return;
 
-  cc::PaintFlags flags;
-  if (InitPaintFlagsForTiling(image, src_x, src_y, tile_scale_x, tile_scale_y,
-                              dest_x, dest_y, &flags))
-    canvas_->drawRect(dest_rect, flags);
+  if (!flags) {
+    cc::PaintFlags paint_flags;
+    flags = &paint_flags;

[Peter Kasting, 2017/03/24 22:52:35]

This doesn't work -- you've declared your temp inside the conditional, so as
soon as you cross the } below, |flags| points to garbage.

You need to declare the temp above the conditional.

[Qiang(Joe) Xu, 2017/03/24 22:57:00]

oh, right! sorry for the iterations...

+  }
+  if (InitPaintFlagsForTiling(image, src_x, src_y, 1.0f, 1.0f, dest_x, dest_y,
+                              flags)) {

[Peter Kasting, 2017/03/24 22:52:35]

Nit: Don't add {}

[Qiang(Joe) Xu, 2017/03/24 22:57:00]

Done.

+    canvas_->drawRect(dest_rect, *flags);
+  }
 }
 
 bool Canvas::InitPaintFlagsForTiling(const ImageSkia& image,
                                      int src_x,
                                      int src_y,
                                      float tile_scale_x,
                                      float tile_scale_y,
                                      int dest_x,
                                      int dest_y,
                                      cc::PaintFlags* flags) {
   const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
   if (image_rep.is_null())
     return false;
 
   SkMatrix shader_scale;
   shader_scale.setScale(SkFloatToScalar(tile_scale_x),
                         SkFloatToScalar(tile_scale_y));
   shader_scale.preTranslate(SkIntToScalar(-src_x), SkIntToScalar(-src_y));
   shader_scale.postTranslate(SkIntToScalar(dest_x), SkIntToScalar(dest_y));
 
   flags->setShader(CreateImageRepShader(image_rep, SkShader::kRepeat_TileMode,
                                         shader_scale));
-  flags->setBlendMode(SkBlendMode::kSrcOver);
   return true;
 }
 
 void Canvas::Transform(const gfx::Transform& transform) {
   canvas_->concat(transform.matrix());
 }
 
 SkBitmap Canvas::GetBitmap() const {
   DCHECK(bitmap_);
   SkBitmap bitmap = bitmap_.value();
@@ skipping 72 matching lines @@
   bitmap_.emplace();
   bitmap_->allocPixels(info);
   // Ensure that the bitmap is zeroed, since the code expects that.
   memset(bitmap_->getPixels(), 0, bitmap_->getSafeSize());
 
   owned_canvas_ = cc::SkiaPaintCanvas(bitmap_.value());
   return &owned_canvas_.value();
 }
 
 }  // namespace gfx