Fix small pixel glitches in omnibox dropdown corners....

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2009 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/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/insets.h"
 #include "app/gfx/path.h"
@@ skipping 564 matching lines @@
 
 class PopupBorder : public views::Border {
  public:
   PopupBorder() {
     InitClass();
   }
   virtual ~PopupBorder() {}
 
   // Returns the border radius of the edge of the popup.
   static int GetBorderRadius() {
-    InitClass();
-    return dropshadow_topleft_->width() - dropshadow_left_->width() - 1;
+    // We can't safely calculate a border radius by comparing the sizes of the
+    // side and corner images, because either may have been extended in various
+    // directions in order to do more subtle dropshadow fading or other effects.
+    // So we hardcode the most accurate value.
+    return 4;
   }
 
   // Overridden from views::Border:
   virtual void Paint(const views::View& view, gfx::Canvas* canvas) const;
   virtual void GetInsets(gfx::Insets* insets) const;
 
  private:
   // Border graphics.
   static SkBitmap* dropshadow_left_;
   static SkBitmap* dropshadow_topleft_;
@@ skipping 235 matching lines @@
 // AutocompletePopupContentsView, AnimationDelegate implementation:
 
 void AutocompletePopupContentsView::AnimationProgressed(
     const Animation* animation) {
   popup_->Show();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, views::View overrides:
 
-void AutocompletePopupContentsView::PaintChildren(gfx::Canvas* canvas) {
+void AutocompletePopupContentsView::Paint(gfx::Canvas* canvas) {
   // We paint our children in an unconventional way.
   //
   // Because the border of this view creates an anti-aliased round-rect region
   // for the contents, we need to render our rectangular result child views into
   // this round rect region. We can't use a simple clip because clipping is
   // 1-bit and we get nasty jagged edges.
   //
   // Instead, we paint all our children into a second canvas and use that as a
   // shader to fill a path representing the round-rect clipping region. This
   // yields a nice anti-aliased edge.
@@ skipping 13 matching lines @@
   SkShader* shader = SkShader::CreateBitmapShader(
       contents_canvas.getDevice()->accessBitmap(false),
       SkShader::kClamp_TileMode,
       SkShader::kClamp_TileMode);
   paint.setShader(shader);
   shader->unref();
 
   gfx::Path path;
   MakeContentsPath(&path, GetLocalBounds(false));
   canvas->drawPath(path, paint);
+
+  // Now we paint the border, so it will be alpha-blended atop the contents.
+  // This looks slightly better in the corners than drawing the contents atop
+  // the border.
+  PaintBorder(canvas);
 }
 
 void AutocompletePopupContentsView::Layout() {
   UpdateBlurRegion();
 
   // Size our children to the available content area.
   gfx::Rect contents_rect = GetLocalBounds(false);
   int child_count = GetChildViewCount();
   int top = contents_rect.y();
   for (int i = 0; i < child_count; ++i) {
@@ skipping 73 matching lines @@
 // static
 AutocompletePopupView* AutocompletePopupView::CreatePopupView(
     const gfx::Font& font,
     AutocompleteEditView* edit_view,
     AutocompleteEditModel* edit_model,
     Profile* profile,
     AutocompletePopupPositioner* popup_positioner) {
   return new AutocompletePopupContentsView(font, edit_view, edit_model,
                                            profile, popup_positioner);
 }