cc/output/software_renderer.h - Issue 2509983004: Revert "Change call-sites now that SkCanvas is not ref-counted"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: cc/output/software_renderer.h

Issue 2509983004: Revert "Change call-sites now that SkCanvas is not ref-counted" (Closed)

Patch Set: Created 4 years, 1 month 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/blimp/picture_data_conversions_unittest.cc ('k') | cc/output/software_renderer.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 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_OUTPUT_SOFTWARE_RENDERER_H_	5 #ifndef CC_OUTPUT_SOFTWARE_RENDERER_H_

6 #define CC_OUTPUT_SOFTWARE_RENDERER_H_	6 #define CC_OUTPUT_SOFTWARE_RENDERER_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "cc/base/cc_export.h"	9 #include "cc/base/cc_export.h"

10 #include "cc/output/direct_renderer.h"	10 #include "cc/output/direct_renderer.h"

(...skipping 86 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97	97

98 bool is_scissor_enabled_ = false;	98 bool is_scissor_enabled_ = false;

99 gfx::Rect scissor_rect_;	99 gfx::Rect scissor_rect_;

100	100

101 SoftwareOutputDevice* output_device_;	101 SoftwareOutputDevice* output_device_;

102 SkCanvas* root_canvas_ = nullptr;	102 SkCanvas* root_canvas_ = nullptr;

103 SkCanvas* current_canvas_ = nullptr;	103 SkCanvas* current_canvas_ = nullptr;

104 SkPaint current_paint_;	104 SkPaint current_paint_;

105 std::unique_ptr<ResourceProvider::ScopedWriteLockSoftware>	105 std::unique_ptr<ResourceProvider::ScopedWriteLockSoftware>

106 current_framebuffer_lock_;	106 current_framebuffer_lock_;

107 std::unique_ptr<SkCanvas> current_framebuffer_canvas_;	107 sk_sp<SkCanvas> current_framebuffer_canvas_;

108	108

109 DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer);	109 DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer);

110 };	110 };

111	111

112 } // namespace cc	112 } // namespace cc

113	113

114 #endif // CC_OUTPUT_SOFTWARE_RENDERER_H_	114 #endif // CC_OUTPUT_SOFTWARE_RENDERER_H_

OLD	NEW