Commit 0f7cd865 authored by junmin.zhu@intel.com's avatar junmin.zhu@intel.com

Replace gfx::ScopedSkRegion with scoped_ptr<SkRegion>.

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10827218

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150742 0039d316-1c4b-4281-b951-d872f2087c98
parent e94dfc34
...@@ -521,8 +521,8 @@ void ShellWindowViews::OnViewWasResized() { ...@@ -521,8 +521,8 @@ void ShellWindowViews::OnViewWasResized() {
SkRegion* rgn = new SkRegion; SkRegion* rgn = new SkRegion;
if (!window_->IsFullscreen()) { if (!window_->IsFullscreen()) {
if (draggable_region_.Get()) if (draggable_region())
rgn->op(*draggable_region_.Get(), SkRegion::kUnion_Op); rgn->op(*draggable_region(), SkRegion::kUnion_Op);
if (!window_->IsMaximized()) { if (!window_->IsMaximized()) {
if (frameless_) if (frameless_)
rgn->op(0, 0, width, kResizeInsideBoundsSize, SkRegion::kUnion_Op); rgn->op(0, 0, width, kResizeInsideBoundsSize, SkRegion::kUnion_Op);
...@@ -572,7 +572,7 @@ void ShellWindowViews::UpdateDraggableRegions( ...@@ -572,7 +572,7 @@ void ShellWindowViews::UpdateDraggableRegions(
SkRegion::kDifference_Op); SkRegion::kDifference_Op);
} }
draggable_region_.Set(draggable_region); draggable_region_.reset(draggable_region);
OnViewWasResized(); OnViewWasResized();
} }
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
#include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/browser/ui/extensions/shell_window.h"
#include "third_party/skia/include/core/SkRegion.h"
#include "ui/gfx/rect.h" #include "ui/gfx/rect.h"
#include "ui/gfx/scoped_sk_region.h"
#include "ui/views/widget/widget_delegate.h" #include "ui/views/widget/widget_delegate.h"
class Profile; class Profile;
...@@ -30,7 +30,7 @@ class ShellWindowViews : public ShellWindow, ...@@ -30,7 +30,7 @@ class ShellWindowViews : public ShellWindow,
const CreateParams& params); const CreateParams& params);
bool frameless() const { return frameless_; } bool frameless() const { return frameless_; }
SkRegion* draggable_region() { return draggable_region_.Get(); } SkRegion* draggable_region() { return draggable_region_.get(); }
// BaseWindow implementation. // BaseWindow implementation.
virtual bool IsActive() const OVERRIDE; virtual bool IsActive() const OVERRIDE;
...@@ -93,7 +93,7 @@ class ShellWindowViews : public ShellWindow, ...@@ -93,7 +93,7 @@ class ShellWindowViews : public ShellWindow,
views::Widget* window_; views::Widget* window_;
bool is_fullscreen_; bool is_fullscreen_;
gfx::ScopedSkRegion draggable_region_; scoped_ptr<SkRegion> draggable_region_;
bool frameless_; bool frameless_;
gfx::Size minimum_size_; gfx::Size minimum_size_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment