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

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

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_content_layer_impl.h ('k') | cc/blink/web_external_bitmap_impl.h » ('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 #include "cc/blink/web_content_layer_impl.h" 5 #include "cc/blink/web_content_layer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ptr_util.h"
10 #include "cc/base/switches.h" 11 #include "cc/base/switches.h"
11 #include "cc/blink/web_display_item_list_impl.h" 12 #include "cc/blink/web_display_item_list_impl.h"
12 #include "cc/layers/picture_layer.h" 13 #include "cc/layers/picture_layer.h"
13 #include "cc/playback/display_item_list_settings.h" 14 #include "cc/playback/display_item_list_settings.h"
14 #include "third_party/WebKit/public/platform/WebContentLayerClient.h" 15 #include "third_party/WebKit/public/platform/WebContentLayerClient.h"
15 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 16 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
16 #include "third_party/WebKit/public/platform/WebFloatRect.h" 17 #include "third_party/WebKit/public/platform/WebFloatRect.h"
17 #include "third_party/WebKit/public/platform/WebRect.h" 18 #include "third_party/WebKit/public/platform/WebRect.h"
18 #include "third_party/WebKit/public/platform/WebSize.h" 19 #include "third_party/WebKit/public/platform/WebSize.h"
19 #include "third_party/skia/include/utils/SkMatrix44.h" 20 #include "third_party/skia/include/utils/SkMatrix44.h"
(...skipping 24 matching lines...) Expand all
44 return blink::WebContentLayerClient::DisplayListPaintingDisabled; 45 return blink::WebContentLayerClient::DisplayListPaintingDisabled;
45 case cc::ContentLayerClient::SUBSEQUENCE_CACHING_DISABLED: 46 case cc::ContentLayerClient::SUBSEQUENCE_CACHING_DISABLED:
46 return blink::WebContentLayerClient::SubsequenceCachingDisabled; 47 return blink::WebContentLayerClient::SubsequenceCachingDisabled;
47 } 48 }
48 NOTREACHED(); 49 NOTREACHED();
49 return blink::WebContentLayerClient::PaintDefaultBehavior; 50 return blink::WebContentLayerClient::PaintDefaultBehavior;
50 } 51 }
51 52
52 WebContentLayerImpl::WebContentLayerImpl(blink::WebContentLayerClient* client) 53 WebContentLayerImpl::WebContentLayerImpl(blink::WebContentLayerClient* client)
53 : client_(client) { 54 : client_(client) {
54 layer_ = make_scoped_ptr(new WebLayerImpl(PictureLayer::Create(this))); 55 layer_ = base::WrapUnique(new WebLayerImpl(PictureLayer::Create(this)));
55 layer_->layer()->SetIsDrawable(true); 56 layer_->layer()->SetIsDrawable(true);
56 } 57 }
57 58
58 WebContentLayerImpl::~WebContentLayerImpl() { 59 WebContentLayerImpl::~WebContentLayerImpl() {
59 static_cast<PictureLayer*>(layer_->layer())->ClearClient(); 60 static_cast<PictureLayer*>(layer_->layer())->ClearClient();
60 } 61 }
61 62
62 blink::WebLayer* WebContentLayerImpl::layer() { 63 blink::WebLayer* WebContentLayerImpl::layer() {
63 return layer_.get(); 64 return layer_.get();
64 } 65 }
(...skipping 20 matching lines...) Expand all
85 86
86 bool WebContentLayerImpl::FillsBoundsCompletely() const { 87 bool WebContentLayerImpl::FillsBoundsCompletely() const {
87 return false; 88 return false;
88 } 89 }
89 90
90 size_t WebContentLayerImpl::GetApproximateUnsharedMemoryUsage() const { 91 size_t WebContentLayerImpl::GetApproximateUnsharedMemoryUsage() const {
91 return client_->approximateUnsharedMemoryUsage(); 92 return client_->approximateUnsharedMemoryUsage();
92 } 93 }
93 94
94 } // namespace cc_blink 95 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_content_layer_impl.h ('k') | cc/blink/web_external_bitmap_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698