Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1119)

Side by Side Diff: cc/blink/web_content_layer_impl.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/blink/web_compositor_support_impl.cc ('k') | cc/blink/web_content_layer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_ 5 #ifndef CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
6 #define CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_ 6 #define CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "cc/blink/cc_blink_export.h" 13 #include "cc/blink/cc_blink_export.h"
13 #include "cc/blink/web_layer_impl.h" 14 #include "cc/blink/web_layer_impl.h"
14 #include "cc/layers/content_layer_client.h" 15 #include "cc/layers/content_layer_client.h"
15 #include "third_party/WebKit/public/platform/WebContentLayer.h" 16 #include "third_party/WebKit/public/platform/WebContentLayer.h"
16 17
17 namespace cc { 18 namespace cc {
18 class IntRect; 19 class IntRect;
19 class FloatRect; 20 class FloatRect;
20 } 21 }
21 22
(...skipping 14 matching lines...) Expand all
36 protected: 37 protected:
37 ~WebContentLayerImpl() override; 38 ~WebContentLayerImpl() override;
38 39
39 // ContentLayerClient implementation. 40 // ContentLayerClient implementation.
40 gfx::Rect PaintableRegion() override; 41 gfx::Rect PaintableRegion() override;
41 scoped_refptr<cc::DisplayItemList> PaintContentsToDisplayList( 42 scoped_refptr<cc::DisplayItemList> PaintContentsToDisplayList(
42 PaintingControlSetting painting_control) override; 43 PaintingControlSetting painting_control) override;
43 bool FillsBoundsCompletely() const override; 44 bool FillsBoundsCompletely() const override;
44 size_t GetApproximateUnsharedMemoryUsage() const override; 45 size_t GetApproximateUnsharedMemoryUsage() const override;
45 46
46 scoped_ptr<WebLayerImpl> layer_; 47 std::unique_ptr<WebLayerImpl> layer_;
47 blink::WebContentLayerClient* client_; 48 blink::WebContentLayerClient* client_;
48 49
49 private: 50 private:
50 DISALLOW_COPY_AND_ASSIGN(WebContentLayerImpl); 51 DISALLOW_COPY_AND_ASSIGN(WebContentLayerImpl);
51 }; 52 };
52 53
53 } // namespace cc_blink 54 } // namespace cc_blink
54 55
55 #endif // CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_ 56 #endif // CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/blink/web_compositor_support_impl.cc ('k') | cc/blink/web_content_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698