content/renderer/gpu/render_widget_compositor.h - Issue 12212099: cc: remove FontAtlas

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: content/renderer/gpu/render_widget_compositor.h

Issue 12212099: cc: remove FontAtlas (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase to 182043 Created 7 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 | « content/browser/renderer_host/compositor_impl_android.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

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

6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_	6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_

7	7

8 #include "cc/layer_tree_host_client.h"	8 #include "cc/layer_tree_host_client.h"

9 #include "cc/layer_tree_settings.h"	9 #include "cc/layer_tree_settings.h"

10 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"	10 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 virtual void applyScrollAndScale(gfx::Vector2d scroll_delta,	76 virtual void applyScrollAndScale(gfx::Vector2d scroll_delta,

77 float page_scale) OVERRIDE;	77 float page_scale) OVERRIDE;

78 virtual scoped_ptr<cc::OutputSurface> createOutputSurface() OVERRIDE;	78 virtual scoped_ptr<cc::OutputSurface> createOutputSurface() OVERRIDE;

79 virtual void didRecreateOutputSurface(bool success) OVERRIDE;	79 virtual void didRecreateOutputSurface(bool success) OVERRIDE;

80 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;	80 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;

81 virtual void willCommit() OVERRIDE;	81 virtual void willCommit() OVERRIDE;

82 virtual void didCommit() OVERRIDE;	82 virtual void didCommit() OVERRIDE;

83 virtual void didCommitAndDrawFrame() OVERRIDE;	83 virtual void didCommitAndDrawFrame() OVERRIDE;

84 virtual void didCompleteSwapBuffers() OVERRIDE;	84 virtual void didCompleteSwapBuffers() OVERRIDE;

85 virtual void scheduleComposite() OVERRIDE;	85 virtual void scheduleComposite() OVERRIDE;

86 virtual scoped_ptr<cc::FontAtlas> createFontAtlas() OVERRIDE;

87	86

88 private:	87 private:

89 RenderWidgetCompositor(RenderWidget* widget,	88 RenderWidgetCompositor(RenderWidget* widget,

90 WebKit::WebLayerTreeViewClient* client);	89 WebKit::WebLayerTreeViewClient* client);

91	90

92 bool initialize(cc::LayerTreeSettings settings);	91 bool initialize(cc::LayerTreeSettings settings);

93	92

94 bool threaded_;	93 bool threaded_;

95 RenderWidget* widget_;	94 RenderWidget* widget_;

96 WebKit::WebLayerTreeViewClient* client_;	95 WebKit::WebLayerTreeViewClient* client_;

97 scoped_ptr<cc::LayerTreeHost> layer_tree_host_;	96 scoped_ptr<cc::LayerTreeHost> layer_tree_host_;

98 };	97 };

99	98

100 } // namespace content	99 } // namespace content

101	100

102 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_	101 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_

103	102

OLD	NEW