diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 12:52:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 12:52:45 +0000 |
| commit | 0023e8b1d2b5cf906e320267ab38d909b1700660 (patch) | |
| tree | 900c4abd1b01a9e7b36a6f861d34f3003232aeb7 /cc/frame_rate_counter.h | |
| parent | e5c7a6d470fe15744cf13c0cddf30da19421cdbb (diff) | |
| download | chromium_src-0023e8b1d2b5cf906e320267ab38d909b1700660.zip chromium_src-0023e8b1d2b5cf906e320267ab38d909b1700660.tar.gz chromium_src-0023e8b1d2b5cf906e320267ab38d909b1700660.tar.bz2 | |
cc: Remove OwnPtr from CCFrameRateCounter.
Instead use scoped_ptr from base/ library.
BUG=154451
R=enne@chromium.org,jamesr@chromium.org
Review URL: https://codereview.chromium.org/11150007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/frame_rate_counter.h')
| -rw-r--r-- | cc/frame_rate_counter.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cc/frame_rate_counter.h b/cc/frame_rate_counter.h index e4a954d..d3247a3 100644 --- a/cc/frame_rate_counter.h +++ b/cc/frame_rate_counter.h @@ -8,8 +8,8 @@ #if USE(ACCELERATED_COMPOSITING) #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" -#include <wtf/PassOwnPtr.h> namespace cc { @@ -17,10 +17,7 @@ namespace cc { // intelligently compute average frames per second (and standard deviation). class CCFrameRateCounter { public: - static PassOwnPtr<CCFrameRateCounter> create() - { - return adoptPtr(new CCFrameRateCounter()); - } + static scoped_ptr<CCFrameRateCounter> create(); void markBeginningOfFrame(base::TimeTicks timestamp); void markEndOfFrame(); @@ -66,7 +63,7 @@ private: DISALLOW_COPY_AND_ASSIGN(CCFrameRateCounter); }; -} // namespace cc +} // namespace cc #endif // USE(ACCELERATED_COMPOSITING) |