Index: gpu/ipc/service/ca_layer_tree_mac.h |
diff --git a/gpu/ipc/service/ca_layer_tree_mac.h b/gpu/ipc/service/ca_layer_tree_mac.h |
index 36aad0d2a578bbbb04f12ccc06c54bb60b6acb36..1e45fd1fa83285864c4fca7b096ae05b0d928efa 100644 |
--- a/gpu/ipc/service/ca_layer_tree_mac.h |
+++ b/gpu/ipc/service/ca_layer_tree_mac.h |
@@ -7,12 +7,13 @@ |
#include <IOSurface/IOSurface.h> |
#include <QuartzCore/QuartzCore.h> |
+ |
#include <deque> |
+#include <memory> |
#include <vector> |
#include "base/mac/scoped_cftyperef.h" |
#include "base/mac/scoped_nsobject.h" |
-#include "base/memory/scoped_ptr.h" |
#include "gpu/gpu_export.h" |
#include "ui/gfx/geometry/rect.h" |
#include "ui/gfx/geometry/rect_f.h" |
@@ -53,7 +54,7 @@ class GPU_EXPORT CALayerTree { |
// be destroyed at the end of the function, and any CALayers in it which were |
// not re-used by |this| will be removed from the CALayer hierarchy. |
void CommitScheduledCALayers(CALayer* superlayer, |
- scoped_ptr<CALayerTree> old_tree, |
+ std::unique_ptr<CALayerTree> old_tree, |
float scale_factor); |
private: |