Chromium Code Reviews Chromium Code Reviews
Issue 11364221:
Fixing RenderingStats vs WebRenderingStats mess (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| 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" |
| 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h " | |
| 11 | 12 |
| 12 namespace cc { | 13 namespace cc { |
| 13 class LayerTreeHost; | 14 class LayerTreeHost; |
| 14 class Thread; | 15 class Thread; |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace WebKit { | 18 namespace WebKit { |
| 18 class WebLayer; | 19 class WebLayer; |
| 19 class WebLayerTreeViewClient; | 20 class WebLayerTreeViewClient; |
| 20 class WebLayerTreeViewClientAdapter; | 21 class WebLayerTreeViewClientAdapter; |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 42 virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimu m, float maximum) OVERRIDE; | 43 virtual void setPageScaleFactorAndLimits(float pageScaleFactor, float minimu m, float maximum) OVERRIDE; |
| 43 virtual void startPageScaleAnimation(const WebPoint& destination, bool useAn chor, float newPageScale, double durationSec) OVERRIDE; | 44 virtual void startPageScaleAnimation(const WebPoint& destination, bool useAn chor, float newPageScale, double durationSec) OVERRIDE; |
| 44 virtual void setNeedsAnimate() OVERRIDE; | 45 virtual void setNeedsAnimate() OVERRIDE; |
| 45 virtual void setNeedsRedraw() OVERRIDE; | 46 virtual void setNeedsRedraw() OVERRIDE; |
| 46 virtual bool commitRequested() const OVERRIDE; | 47 virtual bool commitRequested() const OVERRIDE; |
| 47 virtual void composite() OVERRIDE; | 48 virtual void composite() OVERRIDE; |
| 48 virtual void updateAnimations(double frameBeginTime) OVERRIDE; | 49 virtual void updateAnimations(double frameBeginTime) OVERRIDE; |
| 49 virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE; | 50 virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE; |
| 50 virtual void finishAllRendering() OVERRIDE; | 51 virtual void finishAllRendering() OVERRIDE; |
| 51 virtual void setDeferCommits(bool deferCommits) OVERRIDE; | 52 virtual void setDeferCommits(bool deferCommits) OVERRIDE; |
| 53 #ifdef NOT_USING_WEB_RENDERING_STATS | |
| 54 virtual void renderingStats(void*) const OVERRIDE; | |
|
jamesr
2012/11/13 21:44:53
How is this better than downcasting?
| |
| 55 #else | |
| 52 virtual void renderingStats(WebRenderingStats&) const OVERRIDE; | 56 virtual void renderingStats(WebRenderingStats&) const OVERRIDE; |
| 57 #endif // NOT_USING_WEB_RENDERING_STATS | |
| 53 virtual void setShowFPSCounter(bool show); | 58 virtual void setShowFPSCounter(bool show); |
| 54 virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontH eight); | 59 virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontH eight); |
| 55 virtual void setFontAtlas(WebRect asciiToRectTable[128], const SkBitmap&, in t fontHeight); | 60 virtual void setFontAtlas(WebRect asciiToRectTable[128], const SkBitmap&, in t fontHeight); |
| 56 virtual void loseCompositorContext(int numTimes) OVERRIDE; | 61 virtual void loseCompositorContext(int numTimes) OVERRIDE; |
| 57 | 62 |
| 58 // cc::LayerTreeHostClient implementation. | 63 // cc::LayerTreeHostClient implementation. |
| 59 virtual void willBeginFrame() OVERRIDE; | 64 virtual void willBeginFrame() OVERRIDE; |
| 60 virtual void didBeginFrame() OVERRIDE; | 65 virtual void didBeginFrame() OVERRIDE; |
| 61 virtual void animate(double monotonicFrameBeginTime) OVERRIDE; | 66 virtual void animate(double monotonicFrameBeginTime) OVERRIDE; |
| 62 virtual void layout() OVERRIDE; | 67 virtual void layout() OVERRIDE; |
| 63 virtual void applyScrollAndScale(gfx::Vector2d scrollDelta, float pageScale) OVERRIDE; | 68 virtual void applyScrollAndScale(gfx::Vector2d scrollDelta, float pageScale) OVERRIDE; |
| 64 virtual scoped_ptr<WebCompositorOutputSurface> createOutputSurface() OVERRID E; | 69 virtual scoped_ptr<WebCompositorOutputSurface> createOutputSurface() OVERRID E; |
| 65 virtual void didRecreateOutputSurface(bool success) OVERRIDE; | 70 virtual void didRecreateOutputSurface(bool success) OVERRIDE; |
| 66 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE; | 71 virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE; |
| 67 virtual void willCommit() OVERRIDE; | 72 virtual void willCommit() OVERRIDE; |
| 68 virtual void didCommit() OVERRIDE; | 73 virtual void didCommit() OVERRIDE; |
| 69 virtual void didCommitAndDrawFrame() OVERRIDE; | 74 virtual void didCommitAndDrawFrame() OVERRIDE; |
| 70 virtual void didCompleteSwapBuffers() OVERRIDE; | 75 virtual void didCompleteSwapBuffers() OVERRIDE; |
| 71 virtual void scheduleComposite() OVERRIDE; | 76 virtual void scheduleComposite() OVERRIDE; |
| 72 | 77 |
| 73 private: | 78 private: |
| 74 WebLayerTreeViewClient* m_client; | 79 WebLayerTreeViewClient* m_client; |
| 75 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost; | 80 scoped_ptr<cc::LayerTreeHost> m_layerTreeHost; |
| 76 }; | 81 }; |
| 77 | 82 |
| 78 } // namespace WebKit | 83 } // namespace WebKit |
| 79 | 84 |
| 80 #endif // WebLayerTreeViewImpl_h | 85 #endif // WebLayerTreeViewImpl_h |
| OLD | NEW |
