diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 01:18:51 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 01:18:51 +0000 |
| commit | 2266eb2aa54eb0d8cc741925594f019161b0afa5 (patch) | |
| tree | 726c7117f25e8859badaf2bc81367810944525f2 | |
| parent | 5316c141a4c800d714b14473feb181d6054de9cc (diff) | |
| download | chromium_src-2266eb2aa54eb0d8cc741925594f019161b0afa5.zip chromium_src-2266eb2aa54eb0d8cc741925594f019161b0afa5.tar.gz chromium_src-2266eb2aa54eb0d8cc741925594f019161b0afa5.tar.bz2 | |
cc: Remove wtf types from occlusion tracker / overdraw metrics
R=jamesr@chromium.org
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11148032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162018 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | cc/occlusion_tracker.h | 2 | ||||
| -rw-r--r-- | cc/overdraw_metrics.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cc/occlusion_tracker.h b/cc/occlusion_tracker.h index c2526cd..affd9c5 100644 --- a/cc/occlusion_tracker.h +++ b/cc/occlusion_tracker.h @@ -89,7 +89,7 @@ private: void markOccludedBehindLayer(const LayerType*); IntRect m_rootTargetRect; - OwnPtr<CCOverdrawMetrics> m_overdrawMetrics; + scoped_ptr<CCOverdrawMetrics> m_overdrawMetrics; IntSize m_minimumTrackingSize; // This is used for visualizing the occlusion tracking process. diff --git a/cc/overdraw_metrics.h b/cc/overdraw_metrics.h index b907a64..bbeba8b 100644 --- a/cc/overdraw_metrics.h +++ b/cc/overdraw_metrics.h @@ -5,7 +5,7 @@ #ifndef CCOverdrawMetrics_h #define CCOverdrawMetrics_h -#include <wtf/PassOwnPtr.h> +#include "base/memory/scoped_ptr.h" namespace WebKit { class WebTransformationMatrix; @@ -19,7 +19,7 @@ class CCLayerTreeHostImpl; // FIXME: compute overdraw metrics only occasionally, not every frame. class CCOverdrawMetrics { public: - static PassOwnPtr<CCOverdrawMetrics> create(bool recordMetricsForFrame) { return adoptPtr(new CCOverdrawMetrics(recordMetricsForFrame)); } + static scoped_ptr<CCOverdrawMetrics> create(bool recordMetricsForFrame) { return make_scoped_ptr(new CCOverdrawMetrics(recordMetricsForFrame)); } // These methods are used for saving metrics during update/commit. |