webkit/compositor_bindings/web_layer_tree_view_impl.h - Issue 11312058: Prepare for WebLayerTreeView::setFontAtlas interface change

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

Issue 11312058: Prepare for WebLayerTreeView::setFontAtlas interface change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 50% more compilation 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | 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 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 virtual void startPageScaleAnimation(const WebPoint& destination, bool useAn chor, float newPageScale, double durationSec) OVERRIDE;	42 virtual void startPageScaleAnimation(const WebPoint& destination, bool useAn chor, float newPageScale, double durationSec) OVERRIDE;

43 virtual void setNeedsAnimate() OVERRIDE;	43 virtual void setNeedsAnimate() OVERRIDE;

44 virtual void setNeedsRedraw() OVERRIDE;	44 virtual void setNeedsRedraw() OVERRIDE;

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

46 virtual void composite() OVERRIDE;	46 virtual void composite() OVERRIDE;

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

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

49 virtual void finishAllRendering() OVERRIDE;	49 virtual void finishAllRendering() OVERRIDE;

50 virtual void setDeferCommits(bool deferCommits) OVERRIDE;	50 virtual void setDeferCommits(bool deferCommits) OVERRIDE;

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

52 virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontH eight) OVERRIDE;	52 virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontH eight);

	53 virtual void setFontAtlas(WebRect asciiToRectTable[128], const SkBitmap&, in t fontHeight);

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

54	55

55 // cc::LayerTreeHostClient implementation.	56 // cc::LayerTreeHostClient implementation.

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

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

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

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

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

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

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

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

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

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

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

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

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

69	70

70 private:	71 private:

71 WebLayerTreeViewClient* m_client;	72 WebLayerTreeViewClient* m_client;

72 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost;	73 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost;

73 };	74 };

74	75

75 } // namespace WebKit	76 } // namespace WebKit

76	77

77 #endif // WebLayerTreeViewImpl_h	78 #endif // WebLayerTreeViewImpl_h

OLD	NEW