ui/gfx/compositor/compositor_cc.h - Issue 9008078: Update WebLayerTreeViewClient overrides for WebKit API change

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: ui/gfx/compositor/compositor_cc.h

Issue 9008078: Update WebLayerTreeViewClient overrides for WebKit API change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add override for layout() as well Created 8 years, 11 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | ui/gfx/compositor/compositor_cc.cc » ('j') | no next file with comments »

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

6 #define UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_	6 #define UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_

7 #pragma once	7 #pragma once

8	8

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/memory/singleton.h"	10 #include "base/memory/singleton.h"

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 virtual void Blur(const gfx::Rect& bounds) OVERRIDE;	94 virtual void Blur(const gfx::Rect& bounds) OVERRIDE;

95 virtual void ScheduleDraw() OVERRIDE;	95 virtual void ScheduleDraw() OVERRIDE;

96 virtual void OnNotifyStart(bool clear) OVERRIDE;	96 virtual void OnNotifyStart(bool clear) OVERRIDE;

97 virtual void OnNotifyEnd() OVERRIDE;	97 virtual void OnNotifyEnd() OVERRIDE;

98 virtual void OnWidgetSizeChanged() OVERRIDE;	98 virtual void OnWidgetSizeChanged() OVERRIDE;

99 virtual void OnRootLayerChanged() OVERRIDE;	99 virtual void OnRootLayerChanged() OVERRIDE;

100 virtual void DrawTree() OVERRIDE;	100 virtual void DrawTree() OVERRIDE;

101 virtual bool ReadPixels(SkBitmap* bitmap, const gfx::Rect& bounds) OVERRIDE;	101 virtual bool ReadPixels(SkBitmap* bitmap, const gfx::Rect& bounds) OVERRIDE;

102	102

103 // WebLayerTreeViewClient implementation.	103 // WebLayerTreeViewClient implementation.

	104 // TODO(jamesr): Remove this override once upstream declaration is removed and

	105 // rolled into DEPS

104 virtual void animateAndLayout(double frameBeginTime);	106 virtual void animateAndLayout(double frameBeginTime);

	107

	108 virtual void updateAnimations(double frameBeginTime);

	109 virtual void layout();

105 virtual void applyScrollAndScale(const WebKit::WebSize& scrollDelta,	110 virtual void applyScrollAndScale(const WebKit::WebSize& scrollDelta,

106 float scaleFactor);	111 float scaleFactor);

107 virtual void applyScrollDelta(const WebKit::WebSize&);	112 virtual void applyScrollDelta(const WebKit::WebSize&);

108 virtual WebKit::WebGraphicsContext3D* createContext3D();	113 virtual WebKit::WebGraphicsContext3D* createContext3D();

109 virtual void didRebindGraphicsContext(bool success);	114 virtual void didRebindGraphicsContext(bool success);

110 virtual void scheduleComposite();	115 virtual void scheduleComposite();

111	116

112 private:	117 private:

113 gfx::AcceleratedWidget widget_;	118 gfx::AcceleratedWidget widget_;

114 WebKit::WebLayer root_web_layer_;	119 WebKit::WebLayer root_web_layer_;

115 WebKit::WebLayerTreeView host_;	120 WebKit::WebLayerTreeView host_;

116	121

117 DISALLOW_COPY_AND_ASSIGN(CompositorCC);	122 DISALLOW_COPY_AND_ASSIGN(CompositorCC);

118 };	123 };

119	124

120 } // namespace ui	125 } // namespace ui

121	126

122 #endif // UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_	127 #endif // UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_

OLD	NEW