| Index: cc/CCOverdrawMetrics.h
|
| diff --git a/cc/CCOverdrawMetrics.h b/cc/CCOverdrawMetrics.h
|
| index b907a64b4c2cca5f2893a615aad17375c4772dc2..94a178810d11efb52b0c264fefb2a9ff682a7652 100644
|
| --- a/cc/CCOverdrawMetrics.h
|
| +++ b/cc/CCOverdrawMetrics.h
|
| @@ -2,96 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CCOverdrawMetrics_h
|
| -#define CCOverdrawMetrics_h
|
| -
|
| -#include <wtf/PassOwnPtr.h>
|
| -
|
| -namespace WebKit {
|
| -class WebTransformationMatrix;
|
| -}
|
| -
|
| -namespace cc {
|
| -class IntRect;
|
| -class CCLayerTreeHost;
|
| -class CCLayerTreeHostImpl;
|
| -
|
| -// FIXME: compute overdraw metrics only occasionally, not every frame.
|
| -class CCOverdrawMetrics {
|
| -public:
|
| - static PassOwnPtr<CCOverdrawMetrics> create(bool recordMetricsForFrame) { return adoptPtr(new CCOverdrawMetrics(recordMetricsForFrame)); }
|
| -
|
| - // These methods are used for saving metrics during update/commit.
|
| -
|
| - // Record pixels painted by WebKit into the texture updater, but does not mean the pixels were rasterized in main memory.
|
| - void didPaint(const IntRect& paintedRect);
|
| - // Records that an invalid tile was culled and did not need to be painted/uploaded, and did not contribute to other tiles needing to be painted.
|
| - void didCullTileForUpload();
|
| - // Records pixels that were uploaded to texture memory.
|
| - void didUpload(const WebKit::WebTransformationMatrix& transformToTarget, const IntRect& uploadRect, const IntRect& opaqueRect);
|
| - // Record contents texture(s) behind present using the given number of bytes.
|
| - void didUseContentsTextureMemoryBytes(size_t contentsTextureUseBytes);
|
| - // Record RenderSurface texture(s) being present using the given number of bytes.
|
| - void didUseRenderSurfaceTextureMemoryBytes(size_t renderSurfaceUseBytes);
|
| -
|
| - // These methods are used for saving metrics during draw.
|
| -
|
| - // Record pixels that were not drawn to screen.
|
| - void didCullForDrawing(const WebKit::WebTransformationMatrix& transformToTarget, const IntRect& beforeCullRect, const IntRect& afterCullRect);
|
| - // Record pixels that were drawn to screen.
|
| - void didDraw(const WebKit::WebTransformationMatrix& transformToTarget, const IntRect& afterCullRect, const IntRect& opaqueRect);
|
| -
|
| - void recordMetrics(const CCLayerTreeHost*) const;
|
| - void recordMetrics(const CCLayerTreeHostImpl*) const;
|
| -
|
| - // Accessors for tests.
|
| - float pixelsDrawnOpaque() const { return m_pixelsDrawnOpaque; }
|
| - float pixelsDrawnTranslucent() const { return m_pixelsDrawnTranslucent; }
|
| - float pixelsCulledForDrawing() const { return m_pixelsCulledForDrawing; }
|
| - float pixelsPainted() const { return m_pixelsPainted; }
|
| - float pixelsUploadedOpaque() const { return m_pixelsUploadedOpaque; }
|
| - float pixelsUploadedTranslucent() const { return m_pixelsUploadedTranslucent; }
|
| - int tilesCulledForUpload() const { return m_tilesCulledForUpload; }
|
| -
|
| -private:
|
| - enum MetricsType {
|
| - UpdateAndCommit,
|
| - DrawingToScreen
|
| - };
|
| -
|
| - explicit CCOverdrawMetrics(bool recordMetricsForFrame);
|
| -
|
| - template<typename LayerTreeHostType>
|
| - void recordMetricsInternal(MetricsType, const LayerTreeHostType*) const;
|
| -
|
| - // When false this class is a giant no-op.
|
| - bool m_recordMetricsForFrame;
|
| -
|
| - // These values are used for saving metrics during update/commit.
|
| -
|
| - // Count of pixels that were painted due to invalidation.
|
| - float m_pixelsPainted;
|
| - // Count of pixels uploaded to textures and known to be opaque.
|
| - float m_pixelsUploadedOpaque;
|
| - // Count of pixels uploaded to textures and not known to be opaque.
|
| - float m_pixelsUploadedTranslucent;
|
| - // Count of tiles that were invalidated but not uploaded.
|
| - int m_tilesCulledForUpload;
|
| - // Count the number of bytes in contents textures.
|
| - unsigned long long m_contentsTextureUseBytes;
|
| - // Count the number of bytes in RenderSurface textures.
|
| - unsigned long long m_renderSurfaceTextureUseBytes;
|
| -
|
| - // These values are used for saving metrics during draw.
|
| -
|
| - // Count of pixels that are opaque (and thus occlude). Ideally this is no more than wiewport width x height.
|
| - float m_pixelsDrawnOpaque;
|
| - // Count of pixels that are possibly translucent, and cannot occlude.
|
| - float m_pixelsDrawnTranslucent;
|
| - // Count of pixels not drawn as they are occluded by somthing opaque.
|
| - float m_pixelsCulledForDrawing;
|
| -};
|
| -
|
| -} // namespace cc
|
| -
|
| -#endif
|
| +// Temporary forwarding header
|
| +#include "cc/overdraw_metrics.h"
|
|
|