diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 00:38:45 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 00:38:45 +0000 |
commit | b7aaf42c6a4a3ce2b45801079f6f7dbea073d0e8 (patch) | |
tree | 312d25b9356bfc94bdff0983a831dcd6968d05e8 /base | |
parent | eebc0b413d66975e86be3814103438c3ec154bec (diff) | |
download | chromium_src-b7aaf42c6a4a3ce2b45801079f6f7dbea073d0e8.zip chromium_src-b7aaf42c6a4a3ce2b45801079f6f7dbea073d0e8.tar.gz chromium_src-b7aaf42c6a4a3ce2b45801079f6f7dbea073d0e8.tar.bz2 |
Gets find bar animation/clipping to work on views/gtk.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/340077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/base.gyp | 1 | ||||
-rw-r--r-- | base/scoped_handle.h | 2 | ||||
-rw-r--r-- | base/scoped_handle_gtk.h | 50 | ||||
-rw-r--r-- | base/scoped_handle_win.h | 8 |
4 files changed, 60 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp index 7ead978..b79568d 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -253,6 +253,7 @@ 'scoped_cftyperef.h', 'scoped_comptr_win.h', 'scoped_handle.h', + 'scoped_handle_gtk.h', 'scoped_handle_win.h', 'scoped_nsautorelease_pool.h', 'scoped_nsautorelease_pool.mm', diff --git a/base/scoped_handle.h b/base/scoped_handle.h index e53b2dd..913271d6 100644 --- a/base/scoped_handle.h +++ b/base/scoped_handle.h @@ -11,6 +11,8 @@ #if defined(OS_WIN) #include "base/scoped_handle_win.h" +#elif defined(OS_LINUX) +#include "base/scoped_handle_gtk.h" #endif class ScopedStdioHandle { diff --git a/base/scoped_handle_gtk.h b/base/scoped_handle_gtk.h new file mode 100644 index 0000000..06dd64d --- /dev/null +++ b/base/scoped_handle_gtk.h @@ -0,0 +1,50 @@ +// 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. + +#ifndef BASE_SCOPED_HANDLE_GTK_H_ +#define BASE_SCOPED_HANDLE_GTK_H_ + +#include <gdk/gdk.h> + +// Wraps a GdkRegion. This class provides the same methods as ScopedGDIObject in +// scoped_handle_win. +class ScopedRegion { + public: + ScopedRegion() : region_(NULL) {} + explicit ScopedRegion(GdkRegion* region) : region_(region) {} + + ~ScopedRegion() { + Close(); + } + + void Set(GdkRegion* region) { + Close(); + + region_ = region; + } + + GdkRegion* Get() { + return region_; + } + + GdkRegion* release() { + GdkRegion* region = region_; + region_ = NULL; + return region; + } + + private: + void Close() { + if (region_) { + gdk_region_destroy(region_); + region_ = NULL; + } + } + + GdkRegion* region_; + + DISALLOW_COPY_AND_ASSIGN(ScopedRegion); +}; + +#endif // BASE_SCOPED_HANDLE_GTK_H_ diff --git a/base/scoped_handle_win.h b/base/scoped_handle_win.h index dbd0627..6375ad9 100644 --- a/base/scoped_handle_win.h +++ b/base/scoped_handle_win.h @@ -168,6 +168,12 @@ class ScopedGDIObject { return *this; } + T release() { + T object = object_; + object_ = NULL; + return object; + } + operator T() { return object_; } private: @@ -182,7 +188,7 @@ class ScopedGDIObject { // Typedefs for some common use cases. typedef ScopedGDIObject<HBITMAP> ScopedBitmap; -typedef ScopedGDIObject<HRGN> ScopedHRGN; +typedef ScopedGDIObject<HRGN> ScopedRegion; typedef ScopedGDIObject<HFONT> ScopedHFONT; |