Revert 198491 "Render opaque border with no shadow for web conte..."

trunk/src/ui/views/bubble/bubble_frame_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 "ui/views/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 
 namespace {
 
 // Insets, in pixels, for the title view, when it exists.
 const int kTitleTopInset = 19;
@@ skipping 67 matching lines @@
 
 int BubbleFrameView::NonClientHitTest(const gfx::Point& point) {
   if (close_->visible() && close_->GetMirroredBounds().Contains(point))
     return HTCLOSE;
   if (can_drag_ && point.y() < GetInsets().top())
     return HTCAPTION;
   return GetWidget()->client_view()->NonClientHitTest(point);
 }
 
 void BubbleFrameView::GetWindowMask(const gfx::Size& size,
-                                    gfx::Path* window_mask) {
-  if (bubble_border_->shadow() != BubbleBorder::NO_SHADOW_OPAQUE_BORDER)
-    return;
-
-  // Use a window mask roughly matching the border in the image assets.
-
-  // Stroke size in pixels of borders in image assets.
-  static const int kBorderStrokeSize = 1;
-
-  gfx::Insets border_insets = bubble_border_->GetInsets();
-  SkRect rect = {border_insets.left() - kBorderStrokeSize,
-                 border_insets.top() - kBorderStrokeSize,
-                 size.width() - border_insets.right() + kBorderStrokeSize,
-                 size.height() - border_insets.bottom() + kBorderStrokeSize};
-
-  // Approximate rounded corners matching the border.
-  SkPoint polygon[] = {
-    {rect.left() + 2, rect.top()},
-    {rect.left() + 1, rect.top() + 1},
-    {rect.left(), rect.top() + 2},
-
-    {rect.left(), rect.bottom() - 3},
-    {rect.left() + 1, rect.bottom() - 2},
-    {rect.left() + 2, rect.bottom()},
-
-    {rect.right() - 3, rect.bottom()},
-    {rect.right() - 1, rect.bottom() - 2},
-    {rect.right(), rect.bottom() - 3},
-
-    {rect.right(), rect.top() + 2},
-    {rect.right() - 1, rect.top() + 1},
-    {rect.right() - 2, rect.top()}
-  };
-
-  window_mask->addPoly(polygon, sizeof(polygon)/sizeof(polygon[0]), true);
-}
+                                    gfx::Path* window_mask) {}
 
 void BubbleFrameView::ResetWindowControls() {}
 
 void BubbleFrameView::UpdateWindowIcon() {}
 
 void BubbleFrameView::UpdateWindowTitle() {}
 
 gfx::Insets BubbleFrameView::GetInsets() const {
   gfx::Insets insets = content_margins_;
   insets += gfx::Insets(
@@ skipping 158 matching lines @@
   // |offscreen_adjust|, e.g. positive |offscreen_adjust| means bubble
   // window needs to be moved to the right and that means we need to move arrow
   // to the left, and that means negative offset.
   bubble_border_->set_arrow_offset(
       bubble_border_->GetArrowOffset(window_bounds.size()) - offscreen_adjust);
   if (offscreen_adjust)
     SchedulePaint();
 }
 
 }  // namespace views