webkit/compositor_bindings/web_layer_tree_view_impl.h - Issue 11189037: toggle FPS counter in compositor

Side by Side Diff: webkit/compositor_bindings/web_layer_tree_view_impl.h

Issue 11189037: toggle FPS counter in compositor (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: added DCHECKs and moved hasFontAtlas into HUDLayer Created 8 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:

« cc/layer_tree_host.cc ('K') | « cc/layer_tree_host.cc ('k') | webkit/compositor_bindings/web_layer_tree_view_impl.cc » ('j') | no next file with comments »

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

6 #define WebLayerTreeViewImpl_h	6 #define WebLayerTreeViewImpl_h

7	7

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

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

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

(...skipping 29 matching lines...) Expand all Loading...
40 virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimu m, float maximum) OVERRIDE;	40 virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimu m, float maximum) OVERRIDE;

41 virtual void startPageScaleAnimation(const WebPoint& destination, bool useAn chor, float newPageScale, double durationSec) OVERRIDE;	41 virtual void startPageScaleAnimation(const WebPoint& destination, bool useAn chor, float newPageScale, double durationSec) OVERRIDE;

42 virtual void setNeedsAnimate() OVERRIDE;	42 virtual void setNeedsAnimate() OVERRIDE;

43 virtual void setNeedsRedraw() OVERRIDE;	43 virtual void setNeedsRedraw() OVERRIDE;

44 virtual bool commitRequested() const OVERRIDE;	44 virtual bool commitRequested() const OVERRIDE;

45 virtual void composite() OVERRIDE;	45 virtual void composite() OVERRIDE;

46 virtual void updateAnimations(double frameBeginTime) OVERRIDE;	46 virtual void updateAnimations(double frameBeginTime) OVERRIDE;

47 virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE;	47 virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE;

48 virtual void finishAllRendering() OVERRIDE;	48 virtual void finishAllRendering() OVERRIDE;

49 virtual void renderingStats(WebRenderingStats&) const OVERRIDE;	49 virtual void renderingStats(WebRenderingStats&) const OVERRIDE;

	50 virtual void setShowFPSCounter(bool show);

	51 virtual bool hasFontAtlas() const;
	enne (OOO) 2012/10/24 18:35:27 I don't like exposing hasFontAtlas here. The call I don't like exposing hasFontAtlas here. The caller should know itself whether or not setFontAtlas has been called previously. I'd prefer if instead this was just documented that setFontAtlas must be called before setShowFPSCounter.
50 virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontH eight) OVERRIDE;	52 virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontH eight) OVERRIDE;

51 virtual void loseCompositorContext(int numTimes) OVERRIDE;	53 virtual void loseCompositorContext(int numTimes) OVERRIDE;

52	54

53 // cc::CCLayerTreeHostClient implementation.	55 // cc::CCLayerTreeHostClient implementation.

54 virtual void willBeginFrame() OVERRIDE;	56 virtual void willBeginFrame() OVERRIDE;

55 virtual void didBeginFrame() OVERRIDE;	57 virtual void didBeginFrame() OVERRIDE;

56 virtual void animate(double monotonicFrameBeginTime) OVERRIDE;	58 virtual void animate(double monotonicFrameBeginTime) OVERRIDE;

57 virtual void layout() OVERRIDE;	59 virtual void layout() OVERRIDE;

58 virtual void applyScrollAndScale(const cc::IntSize& scrollDelta, float pageS cale) OVERRIDE;	60 virtual void applyScrollAndScale(const cc::IntSize& scrollDelta, float pageS cale) OVERRIDE;

59 virtual scoped_ptr<WebCompositorOutputSurface> createOutputSurface() OVERRID E;	61 virtual scoped_ptr<WebCompositorOutputSurface> createOutputSurface() OVERRID E;

60 virtual void didRecreateOutputSurface(bool success) OVERRIDE;	62 virtual void didRecreateOutputSurface(bool success) OVERRIDE;

61 virtual scoped_ptr<cc::CCInputHandler> createInputHandler() OVERRIDE;	63 virtual scoped_ptr<cc::CCInputHandler> createInputHandler() OVERRIDE;

62 virtual void willCommit() OVERRIDE;	64 virtual void willCommit() OVERRIDE;

63 virtual void didCommit() OVERRIDE;	65 virtual void didCommit() OVERRIDE;

64 virtual void didCommitAndDrawFrame() OVERRIDE;	66 virtual void didCommitAndDrawFrame() OVERRIDE;

65 virtual void didCompleteSwapBuffers() OVERRIDE;	67 virtual void didCompleteSwapBuffers() OVERRIDE;

66 virtual void scheduleComposite() OVERRIDE;	68 virtual void scheduleComposite() OVERRIDE;

67	69

68 private:	70 private:

69 WebLayerTreeViewClient* m_client;	71 WebLayerTreeViewClient* m_client;

70 scoped_ptr<cc::CCLayerTreeHost> m_layerTreeHost;	72 scoped_ptr<cc::CCLayerTreeHost> m_layerTreeHost;

71 };	73 };

72	74

73 } // namespace WebKit	75 } // namespace WebKit

74	76

75 #endif // WebLayerTreeViewImpl_h	77 #endif // WebLayerTreeViewImpl_h

OLD	NEW