diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 22:13:32 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 22:13:32 +0000 |
commit | b99603ceb9cbec4a3b1ca9ac535f6b1cbc951bb8 (patch) | |
tree | 2f9074d5ad8acf95156fc9c390646eca935d232e /ppapi/cpp/resource.cc | |
parent | 004f2cf5d5eb19764260b1f513738be15ae77d47 (diff) | |
download | chromium_src-b99603ceb9cbec4a3b1ca9ac535f6b1cbc951bb8.zip chromium_src-b99603ceb9cbec4a3b1ca9ac535f6b1cbc951bb8.tar.gz chromium_src-b99603ceb9cbec4a3b1ca9ac535f6b1cbc951bb8.tar.bz2 |
Move some functions out of win_util and into hwnd_util, and into a new win/shell file.
This also moves two functions that were only called once from win_util and inwo window_win and download_util, respectively.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6035011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp/resource.cc')
-rw-r--r-- | ppapi/cpp/resource.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ppapi/cpp/resource.cc b/ppapi/cpp/resource.cc index e4a0d96..7daab4a 100644 --- a/ppapi/cpp/resource.cc +++ b/ppapi/cpp/resource.cc @@ -25,15 +25,14 @@ Resource::~Resource() { } Resource& Resource::operator=(const Resource& other) { - Resource copy(other); - swap(copy); + if (!is_null()) + Module::Get()->core()->ReleaseResource(pp_resource_); + pp_resource_ = other.pp_resource_; + if (!is_null()) + Module::Get()->core()->AddRefResource(pp_resource_); return *this; } -void Resource::swap(Resource& other) { - std::swap(pp_resource_, other.pp_resource_); -} - PP_Resource Resource::detach() { PP_Resource ret = pp_resource_; pp_resource_ = 0; |