OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/ui/views/apps/shaped_app_window_targeter.h" | 5 #include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h" |
6 | 6 |
7 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" | 7 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" |
8 #include "ui/gfx/path.h" | 8 #include "ui/gfx/path.h" |
9 | 9 |
10 ShapedAppWindowTargeter::ShapedAppWindowTargeter( | 10 ShapedAppWindowTargeter::ShapedAppWindowTargeter( |
11 aura::Window* window, | 11 aura::Window* window, |
12 ChromeNativeAppWindowViews* app_window) | 12 ChromeNativeAppWindowViews* app_window) |
13 : wm::MaskedWindowTargeter(window), app_window_(app_window) {} | 13 : wm::MaskedWindowTargeter(window), app_window_(app_window) {} |
14 | 14 |
15 ShapedAppWindowTargeter::~ShapedAppWindowTargeter() { | 15 ShapedAppWindowTargeter::~ShapedAppWindowTargeter() { |
16 } | 16 } |
17 | 17 |
18 bool ShapedAppWindowTargeter::GetHitTestMask(aura::Window* window, | 18 bool ShapedAppWindowTargeter::GetHitTestMask(aura::Window* window, |
19 gfx::Path* mask) const { | 19 gfx::Path* mask) const { |
20 SkRegion* shape = app_window_->shape(); | 20 SkRegion* shape = app_window_->shape(); |
21 return shape ? shape->getBoundaryPath(mask) : false; | 21 if (!shape) |
| 22 return false; |
| 23 |
| 24 shape->getBoundaryPath(mask); |
| 25 return true; |
22 } | 26 } |
OLD | NEW |