Changeset 142524 in webkit

Timestamp:

Feb 11, 2013 3:07:43 PM (11 years ago)

Author:

Bruno de Oliveira Abinader

Message:

[texmap] Implement frames-per-second debug counter
​https://bugs.webkit.org/show_bug.cgi?id=107942

Reviewed by Noam Rosenthal.

Adds FPS counter via WEBKIT_SHOW_FPS=<interval> environment variable,
where <interval> is the period in seconds (i.e. =1.5) between FPS
updates on screen. It is measured by counting
CoordinatedGraphicsScene::paintTo* calls and is painted using
drawRepaintCounter() after TextureMapperLayer has finished painting its
contents.

Visual debugging feature, no need for new tests.

• platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:

(WebCore::CoordinatedGraphicsScene::CoordinatedGraphicsScene):
(WebCore::CoordinatedGraphicsScene::paintToCurrentGLContext):
(WebCore::CoordinatedGraphicsScene::paintToGraphicsContext):
(WebCore::CoordinatedGraphicsScene::updateFPS):

• platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp (modified) (5 diffs)
• platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-11  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
+
+        [texmap] Implement frames-per-second debug counter
+        https://bugs.webkit.org/show_bug.cgi?id=107942
+
+        Reviewed by Noam Rosenthal.
+
+        Adds FPS counter via WEBKIT_SHOW_FPS=<interval> environment variable,
+        where <interval> is the period in seconds (i.e. =1.5) between FPS
+        updates on screen. It is measured by counting
+        CoordinatedGraphicsScene::paintTo* calls and is painted using
+        drawRepaintCounter() after TextureMapperLayer has finished painting its
+        contents.
+
+        Visual debugging feature, no need for new tests.
+
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
+        (WebCore::CoordinatedGraphicsScene::CoordinatedGraphicsScene):
+        (WebCore::CoordinatedGraphicsScene::paintToCurrentGLContext):
+        (WebCore::CoordinatedGraphicsScene::paintToGraphicsContext):
+        (WebCore::CoordinatedGraphicsScene::updateFPS):
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h:
+
 2013-02-11  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp

@@ -33 +33 @@
 #include <OpenGLShims.h>
 #include <wtf/Atomics.h>
+#include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
 
@@ -77 +78 @@
     , m_backgroundColor(Color::white)
     , m_setDrawsBackground(false)
+    , m_isShowingFPS(false)
+    , m_fpsInterval(0)
+    , m_fpsTimestamp(0)
+    , m_lastFPS(0)
+    , m_frameCount(0)
 {
     ASSERT(isMainThread());
+
+    String showFPSEnvironment = getenv("WEBKIT_SHOW_FPS");
+    bool ok = false;
+    m_fpsInterval = showFPSEnvironment.toDouble(&ok);
+    if (ok && m_fpsInterval) {
+        m_isShowingFPS = true;
+        m_fpsTimestamp = WTF::currentTime();
+    }
 }
 
@@ -125 +139 @@
 
     layer->paint();
+    if (m_isShowingFPS)
+        updateFPS(clipRect.location(), matrix);
     m_textureMapper->endClip();
     m_textureMapper->endPainting();
@@ -172 +188 @@
     m_textureMapper->beginPainting();
 
+    IntRect clipRect = graphicsContext.clipBounds();
     if (m_setDrawsBackground)
-        m_textureMapper->drawSolidColor(graphicsContext.clipBounds(), TransformationMatrix(), m_backgroundColor);
+        m_textureMapper->drawSolidColor(clipRect, TransformationMatrix(), m_backgroundColor);
 
     layer->paint();
+    if (m_isShowingFPS)
+        updateFPS(clipRect.location());
     m_textureMapper->endPainting();
     m_textureMapper->setGraphicsContext(0);
@@ -694 +713 @@
 }
 
+void CoordinatedGraphicsScene::updateFPS(const FloatPoint& location, const TransformationMatrix& matrix)
+{
+    m_frameCount++;
+    double delta = WTF::currentTime() - m_fpsTimestamp;
+    if (delta >= m_fpsInterval) {
+        m_lastFPS = int(m_frameCount / delta);
+        m_frameCount = 0;
+        m_fpsTimestamp += delta;
+    }
+
+    // FIXME: drawRepaintCounter() should save a texture and re-use whenever possible.
+    m_textureMapper->drawRepaintCounter(m_lastFPS, Color::black, location, matrix);
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h

@@ -175 +175 @@
     void resetBackingStoreSizeToLayerSize(GraphicsLayer*);
 
+    void updateFPS(const FloatPoint&, const TransformationMatrix& = TransformationMatrix());
+
     FloatSize m_contentsSize;
     FloatRect m_visibleContentsRect;
@@ -225 +227 @@
     CustomFilterProgramMap m_customFilterPrograms;
 #endif
+
+    bool m_isShowingFPS;
+    double m_fpsInterval;
+    double m_fpsTimestamp;
+    int m_lastFPS;
+    int m_frameCount;
 };