cc/layers/picture_image_layer.cc - Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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/layers/picture_image_layer.cc

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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/layers/layer_unittest.cc ('k') | cc/layers/picture_image_layer_impl_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2010 The Chromium Authors. All rights reserved.	1 // Copyright 2010 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/layers/picture_image_layer.h"	5 #include "cc/layers/picture_image_layer.h"

6	6

7 #include "cc/layers/picture_image_layer_impl.h"	7 #include "cc/layers/picture_image_layer_impl.h"

8 #include "cc/resources/drawing_display_item.h"	8 #include "cc/resources/drawing_display_item.h"

9 #include "third_party/skia/include/core/SkCanvas.h"	9 #include "third_party/skia/include/core/SkCanvas.h"

10 #include "third_party/skia/include/core/SkPictureRecorder.h"	10 #include "third_party/skia/include/core/SkPictureRecorder.h"

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 scoped_refptr<DisplayItemList> PictureImageLayer::PaintContentsToDisplayList(	66 scoped_refptr<DisplayItemList> PictureImageLayer::PaintContentsToDisplayList(

67 const gfx::Rect& clip,	67 const gfx::Rect& clip,

68 ContentLayerClient::PaintingControlSetting painting_control) {	68 ContentLayerClient::PaintingControlSetting painting_control) {

69 scoped_refptr<DisplayItemList> display_item_list = DisplayItemList::Create();	69 scoped_refptr<DisplayItemList> display_item_list = DisplayItemList::Create();

70	70

71 SkPictureRecorder recorder;	71 SkPictureRecorder recorder;

72 SkCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(clip));	72 SkCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(clip));

73 PaintContents(canvas, clip, painting_control);	73 PaintContents(canvas, clip, painting_control);

74	74

75 skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());	75 skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());

76 display_item_list->AppendItem(DrawingDisplayItem::Create(picture));	76 display_item_list->AppendItem(

	77 DrawingDisplayItem::Create(picture, gfx::Point()));

77 return display_item_list;	78 return display_item_list;

78 }	79 }

79	80

80 bool PictureImageLayer::FillsBoundsCompletely() const {	81 bool PictureImageLayer::FillsBoundsCompletely() const {

81 return false;	82 return false;

82 }	83 }

83	84

84 } // namespace cc	85 } // namespace cc

OLD	NEW