Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.h - Issue 10873098: Merge 125445 - [chromium] Clear HUD canvas contents before drawing into it.

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: Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.h

Issue 10873098: Merge 125445 - [chromium] Clear HUD canvas contents before drawing into it. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 years, 3 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 | « Source/WebCore/ChangeLog ('k') | Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61	61

62 virtual const char* layerTypeAsString() const OVERRIDE { return "HeadsUpDisp layLayer"; }	62 virtual const char* layerTypeAsString() const OVERRIDE { return "HeadsUpDisp layLayer"; }

63	63

64 void drawHudContents(SkCanvas*);	64 void drawHudContents(SkCanvas*);

65 void drawFPSCounter(SkCanvas, CCFrameRateCounter, int top, int height);	65 void drawFPSCounter(SkCanvas, CCFrameRateCounter, int top, int height);

66 void drawFPSCounterText(SkCanvas, CCFrameRateCounter, int top, int width, int height);	66 void drawFPSCounterText(SkCanvas, CCFrameRateCounter, int top, int width, int height);

67 void drawDebugRects(SkCanvas, CCDebugRectHistory);	67 void drawDebugRects(SkCanvas, CCDebugRectHistory);

68	68

69 OwnPtr<CCFontAtlas> m_fontAtlas;	69 OwnPtr<CCFontAtlas> m_fontAtlas;

70 OwnPtr<CCScopedTexture> m_hudTexture;	70 OwnPtr<CCScopedTexture> m_hudTexture;

	71 OwnPtr<SkCanvas> m_hudCanvas;

71 };	72 };

72	73

73 }	74 }

74	75

75 #endif // CCHeadsUpDisplayLayerImpl_h	76 #endif // CCHeadsUpDisplayLayerImpl_h

OLD	NEW