cc/layers/ui_resource_layer.h - Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

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/ui_resource_layer.h

Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 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/layers/tiled_layer_unittest.cc ('k') | cc/layers/ui_resource_layer_impl.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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_LAYERS_UI_RESOURCE_LAYER_H_	5 #ifndef CC_LAYERS_UI_RESOURCE_LAYER_H_

6 #define CC_LAYERS_UI_RESOURCE_LAYER_H_	6 #define CC_LAYERS_UI_RESOURCE_LAYER_H_

7	7

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

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

10 #include "cc/layers/layer.h"	10 #include "cc/layers/layer.h"

11 #include "cc/resources/ui_resource_client.h"	11 #include "cc/resources/ui_resource_client.h"

12 #include "ui/gfx/rect.h"	12 #include "ui/gfx/geometry/rect.h"

13	13

14 namespace cc {	14 namespace cc {

15	15

16 class LayerTreeHost;	16 class LayerTreeHost;

17 class ScopedUIResource;	17 class ScopedUIResource;

18	18

19 class CC_EXPORT UIResourceLayer : public Layer {	19 class CC_EXPORT UIResourceLayer : public Layer {

20 public:	20 public:

21 static scoped_refptr<UIResourceLayer> Create();	21 static scoped_refptr<UIResourceLayer> Create();

22	22

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 void RecreateUIResourceHolder();	63 void RecreateUIResourceHolder();

64	64

65	65

66	66

67 DISALLOW_COPY_AND_ASSIGN(UIResourceLayer);	67 DISALLOW_COPY_AND_ASSIGN(UIResourceLayer);

68 };	68 };

69	69

70 } // namespace cc	70 } // namespace cc

71	71

72 #endif // CC_LAYERS_UI_RESOURCE_LAYER_H_	72 #endif // CC_LAYERS_UI_RESOURCE_LAYER_H_

OLD	NEW