Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Side by Side Diff: ui/views/shadow_border.cc

Issue 900163002: Make ShadowBorder use ShadowValue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_animations
Patch Set: address comments Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/views/shadow_border.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/shadow_border.h" 5 #include "ui/views/shadow_border.h"
6 6
7 #include "ui/gfx/canvas.h" 7 #include "ui/gfx/canvas.h"
8 #include "ui/gfx/geometry/insets.h" 8 #include "ui/gfx/geometry/insets.h"
9 #include "ui/gfx/geometry/rect.h" 9 #include "ui/gfx/geometry/rect.h"
10 #include "ui/gfx/shadow_value.h"
11 #include "ui/gfx/skia_util.h" 10 #include "ui/gfx/skia_util.h"
12 #include "ui/views/view.h" 11 #include "ui/views/view.h"
13 12
14 namespace views { 13 namespace views {
15 14
16 ShadowBorder::ShadowBorder(int blur, 15 namespace {
17 SkColor color, 16
18 int vertical_offset, 17 gfx::Insets GetInsetsFromShadowValue(const gfx::ShadowValue& shadow) {
19 int horizontal_offset) 18 std::vector<gfx::ShadowValue> shadows;
19 shadows.push_back(shadow);
20 return -gfx::ShadowValue::GetMargin(shadows);
21 }
22 }
sky 2015/02/06 15:43:28 nit: newline between the two '}' and add // namesp
calamity 2015/02/08 23:55:01 Done.
23
24 ShadowBorder::ShadowBorder(const gfx::ShadowValue& shadow)
20 : views::Border(), 25 : views::Border(),
21 blur_(blur), 26 shadow_value_(shadow),
22 color_(color), 27 insets_(GetInsetsFromShadowValue(shadow)) {
23 vertical_offset_(vertical_offset), 28 }
24 horizontal_offset_(horizontal_offset) {}
25 29
26 ShadowBorder::~ShadowBorder() {} 30 ShadowBorder::~ShadowBorder() {
31 }
27 32
28 // TODO(sidharthms): Re-painting a shadow looper on every paint call may yield 33 // TODO(sidharthms): Re-painting a shadow looper on every paint call may yield
29 // poor performance. Ideally we should be caching the border to bitmaps. 34 // poor performance. Ideally we should be caching the border to bitmaps.
30 void ShadowBorder::Paint(const views::View& view, gfx::Canvas* canvas) { 35 void ShadowBorder::Paint(const views::View& view, gfx::Canvas* canvas) {
31 SkPaint paint; 36 SkPaint paint;
32 std::vector<gfx::ShadowValue> shadows; 37 std::vector<gfx::ShadowValue> shadows;
33 shadows.push_back(gfx::ShadowValue(gfx::Point(), blur_, color_)); 38 shadows.push_back(shadow_value_);
34 skia::RefPtr<SkDrawLooper> looper = gfx::CreateShadowDrawLooper(shadows); 39 skia::RefPtr<SkDrawLooper> looper = gfx::CreateShadowDrawLooper(shadows);
35 paint.setLooper(looper.get()); 40 paint.setLooper(looper.get());
36 paint.setColor(SK_ColorTRANSPARENT); 41 paint.setColor(SK_ColorTRANSPARENT);
37 paint.setStrokeJoin(SkPaint::kRound_Join); 42 paint.setStrokeJoin(SkPaint::kRound_Join);
38 gfx::Rect bounds(view.size()); 43 gfx::Rect bounds(view.size());
39 // TODO(pkasting): This isn't right if one of the offsets is larger than 44 bounds.Inset(-gfx::ShadowValue::GetMargin(shadows));
40 // (blur_ / 2).
41 bounds.Inset(gfx::Insets(blur_ / 2, blur_ / 2, blur_ / 2, blur_ / 2));
42 canvas->DrawRect(bounds, paint); 45 canvas->DrawRect(bounds, paint);
43 } 46 }
44 47
45 gfx::Insets ShadowBorder::GetInsets() const { 48 gfx::Insets ShadowBorder::GetInsets() const {
46 return gfx::Insets(blur_ / 2 - vertical_offset_, 49 return insets_;
47 blur_ / 2 - horizontal_offset_,
48 blur_ / 2 + vertical_offset_,
49 blur_ / 2 + horizontal_offset_);
50 } 50 }
51 51
52 gfx::Size ShadowBorder::GetMinimumSize() const { 52 gfx::Size ShadowBorder::GetMinimumSize() const {
53 return gfx::Size(blur_, blur_); 53 return gfx::Size(shadow_value_.blur(), shadow_value_.blur());
54 } 54 }
55 55
56 } // namespace views 56 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/shadow_border.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698