cc/test/tiled_layer_test_common.h - Issue 11150025: Patch from https://codereview.chromium.org/11111005/ without actual file deletes

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

Unified Diff: cc/test/tiled_layer_test_common.h

Issue 11150025: Patch from https://codereview.chromium.org/11111005/ without actual file deletes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments

Download patch

Index: cc/test/tiled_layer_test_common.h

diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h

index 555180167dabae3aaabd2199171f2518e4553aa6..96c469ba375fe28462a203195af032fa8bc53d52 100644

--- a/cc/test/tiled_layer_test_common.h

+++ b/cc/test/tiled_layer_test_common.h

@@ -39,7 +39,7 @@ public:

virtual ~FakeLayerTextureUpdater();

virtual PassOwnPtr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE;

- virtual SampledTexelFormat sampledTexelFormat(GC3Denum) OVERRIDE;

+ virtual SampledTexelFormat sampledTexelFormat(GLenum) OVERRIDE;

virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::CCRenderingStats&) OVERRIDE;

// Sets the rect to invalidate during the next call to prepareToUpdate(). After the next

« no previous file with comments | « cc/test/fake_web_graphics_context_3d.h ('k') | cc/test/tiled_layer_test_common.cc » ('j') | no next file with comments »