sky/compositor/layer.cc - Issue 903273002: Update from https://crrev.com/315085

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: sky/compositor/layer.cc

Issue 903273002: Update from https://crrev.com/315085 (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 | « skia/skia_tests.gyp ('k') | sky/compositor/layer_host.cc » ('j') | no next file with comments »

OLD	NEW
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 "sky/compositor/layer.h"	5 #include "sky/compositor/layer.h"

6	6

7 #include "base/debug/trace_event.h"	7 #include "base/trace_event/trace_event.h"

8 #include "sky/compositor/layer_host.h"	8 #include "sky/compositor/layer_host.h"

9 #include "sky/compositor/picture_serializer.h"	9 #include "sky/compositor/picture_serializer.h"

10 #include "sky/compositor/rasterizer.h"	10 #include "sky/compositor/rasterizer.h"

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

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

13	13

14 namespace sky {	14 namespace sky {

15	15

16 Layer::Layer(LayerClient* client) : client_(client) {	16 Layer::Layer(LayerClient* client) : client_(client) {

17 }	17 }

(...skipping 30 matching lines...) Expand all Loading...
48	48

49 client_->PaintContents(canvas.get(), gfx::Rect(size_));	49 client_->PaintContents(canvas.get(), gfx::Rect(size_));

50 return skia::AdoptRef(recorder.endRecordingAsPicture());	50 return skia::AdoptRef(recorder.endRecordingAsPicture());

51 }	51 }

52	52

53 scoped_ptr<mojo::GLTexture> Layer::GetTexture() {	53 scoped_ptr<mojo::GLTexture> Layer::GetTexture() {

54 return texture_.Pass();	54 return texture_.Pass();

55 }	55 }

56	56

57 } // namespace sky	57 } // namespace sky

OLD	NEW