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

Side by Side Diff: ui/compositor/paint_recorder.cc

Issue 1939143002: Remove all uses of skia::RefPtr and stale includes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad rebase Created 4 years, 7 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 | « ui/compositor/paint_recorder.h ('k') | ui/compositor/test/in_process_context_provider.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/compositor/paint_recorder.h" 5 #include "ui/compositor/paint_recorder.h"
6 6
7 #include "cc/playback/display_item_list.h" 7 #include "cc/playback/display_item_list.h"
8 #include "cc/playback/drawing_display_item.h" 8 #include "cc/playback/drawing_display_item.h"
9 #include "third_party/skia/include/core/SkPictureRecorder.h" 9 #include "third_party/skia/include/core/SkPictureRecorder.h"
10 #include "third_party/skia/include/core/SkRefCnt.h"
10 #include "ui/compositor/paint_cache.h" 11 #include "ui/compositor/paint_cache.h"
11 #include "ui/compositor/paint_context.h" 12 #include "ui/compositor/paint_context.h"
12 #include "ui/gfx/skia_util.h" 13 #include "ui/gfx/skia_util.h"
13 14
14 namespace ui { 15 namespace ui {
15 16
16 PaintRecorder::PaintRecorder(const PaintContext& context, 17 PaintRecorder::PaintRecorder(const PaintContext& context,
17 const gfx::Size& recording_size, 18 const gfx::Size& recording_size,
18 PaintCache* cache) 19 PaintCache* cache)
19 : context_(context), 20 : context_(context),
20 // The SkCanvas reference returned by beginRecording is shared with 21 // The SkCanvas reference returned by beginRecording is shared with
21 // the recorder_ so no need to store a RefPtr to it on this class, we just 22 // the recorder_ so no need to store a RefPtr to it on this class, we just
22 // store the gfx::Canvas. 23 // store the gfx::Canvas.
23 canvas_(skia::SharePtr(context.recorder_->beginRecording( 24 canvas_(sk_ref_sp(context.recorder_->beginRecording(
24 gfx::RectToSkRect(gfx::Rect(recording_size)))), 25 gfx::RectToSkRect(gfx::Rect(recording_size)))),
25 context.device_scale_factor_), 26 context.device_scale_factor_),
26 cache_(cache), 27 cache_(cache),
27 bounds_in_layer_(context.ToLayerSpaceBounds(recording_size)) { 28 bounds_in_layer_(context.ToLayerSpaceBounds(recording_size)) {
28 #if DCHECK_IS_ON() 29 #if DCHECK_IS_ON()
29 DCHECK(!context.inside_paint_recorder_); 30 DCHECK(!context.inside_paint_recorder_);
30 context.inside_paint_recorder_ = true; 31 context.inside_paint_recorder_ = true;
31 #endif 32 #endif
32 } 33 }
33 34
34 PaintRecorder::PaintRecorder(const PaintContext& context, 35 PaintRecorder::PaintRecorder(const PaintContext& context,
35 const gfx::Size& recording_size) 36 const gfx::Size& recording_size)
36 : PaintRecorder(context, recording_size, nullptr) { 37 : PaintRecorder(context, recording_size, nullptr) {
37 } 38 }
38 39
39 PaintRecorder::~PaintRecorder() { 40 PaintRecorder::~PaintRecorder() {
40 #if DCHECK_IS_ON() 41 #if DCHECK_IS_ON()
41 context_.inside_paint_recorder_ = false; 42 context_.inside_paint_recorder_ = false;
42 #endif 43 #endif
43 const auto& item = 44 const auto& item =
44 context_.list_->CreateAndAppendItem<cc::DrawingDisplayItem>( 45 context_.list_->CreateAndAppendItem<cc::DrawingDisplayItem>(
45 bounds_in_layer_, 46 bounds_in_layer_,
46 context_.recorder_->finishRecordingAsPicture()); 47 context_.recorder_->finishRecordingAsPicture());
47 if (cache_) 48 if (cache_)
48 cache_->SetCache(item); 49 cache_->SetCache(item);
49 } 50 }
50 51
51 } // namespace ui 52 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/paint_recorder.h ('k') | ui/compositor/test/in_process_context_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698