ChangeLog

2013-02-06  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 NOBODY (OOPS!).

        Added TextureMapper' FPS counter via WEBKIT_SHOW_FPS=<interval> envvar,

        where <interval> is the period (in seconds - i.e. WEBKIT_SHOW_FPS=1.0)

        between FPS value udpates.

        Visual debugging feature, no need to tests.

        * platform/graphics/texmap/TextureMapperLayer.cpp:

        (WebCore::TextureMapperLayer::paint): Paints FPS after all recursive layer paintings.

        (WebCore::TextureMapperLayer::setShowFPS): Toggles FPS visible.

        (WebCore::TextureMapperLayer::setFPS): Updates FPS value.

        * platform/graphics/texmap/TextureMapperLayer.h:

        (TextureMapperLayer): Added setters set{Show}FPS.

        (State): Added 'fps' and 'showFPS'.

        (WebCore::TextureMapperLayer::State::State): Added 'fps' and 'showFPS' to init list.

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

        (WebCore::CoordinatedGraphicsScene::CoordinatedGraphicsScene): Added envvar check code to trigger timer updates.

        (WebCore::CoordinatedGraphicsScene::paintToCurrentGLContext): Increments paint count.

        (WebCore::CoordinatedGraphicsScene::paintToGraphicsContext): Increments paint count.

        (WebCore::CoordinatedGraphicsScene::fpsTimerFired): Updates FPS value to root layer.

        * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h: Added FPS variables/timer functions.

2013-02-04  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>

        [WK2] CoordinatedLayerInfo is a struct, not a class

Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

@@void TextureMapperLayer::paint()

    options.textureMapper = m_textureMapper;

    options.textureMapper->bindSurface(0);

    paintRecursive(options);

    static Color fpsColor = Color::black;

    static FloatPoint fpsPoint;

    // FIXME: Using drawRepaintCounter() from TextureMapper.

    if (m_state.showFPS)

        options.textureMapper->drawRepaintCounter(m_state.fps, fpsColor, fpsPoint, m_currentTransform.combined());

}

static Color blendWithOpacity(const Color& color, float opacity)

@@void TextureMapperLayer::setRepaintCount(int repaintCount)

    m_state.repaintCount = repaintCount;

}

void TextureMapperLayer::setShowFPS(bool showFPS)

{

    m_state.showFPS = showFPS;

}

void TextureMapperLayer::setFPS(int fps)

{

    m_state.fps = fps;

}

void TextureMapperLayer::setContentsLayer(TextureMapperPlatformLayer* platformLayer)

{

    m_contentsLayer = platformLayer;

Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h

@@public:

#endif

    void setDebugVisuals(bool showDebugBorders, const Color& debugBorderColor, float debugBorderWidth, bool showRepaintCounter);

    void setRepaintCount(int);

83 void setShowFPS(bool);

84 void setFPS(int);

    void setContentsLayer(TextureMapperPlatformLayer*);

    void setAnimations(const GraphicsLayerAnimations&);

    void setFixedToViewport(bool);

@@private:

        Color debugBorderColor;

        float debugBorderWidth;

        int repaintCount;

178 int fps;

        bool preserves3D : 1;

        bool masksToBounds : 1;

@@private:

        bool visible : 1;

        bool showDebugBorders : 1;

        bool showRepaintCounter : 1;

189 bool showFPS : 1;

        State()

            : opacity(1)

@@private:

            , replicaLayer(0)

            , debugBorderWidth(0)

            , repaintCount(0)

197 , fps(0)

            , preserves3D(false)

            , masksToBounds(false)

            , drawsContent(false)

@@private:

            , visible(true)

            , showDebugBorders(false)

            , showRepaintCounter(false)

207 , showFPS(false)

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

@@CoordinatedGraphicsScene::CoordinatedGraphicsScene(CoordinatedGraphicsSceneClien

#endif

    , m_backgroundColor(Color::white)

    , m_setDrawsBackground(false)

    , m_paintCount(0)

    , m_fpsInterval(0)

    , m_fpsTimer(this, &CoordinatedGraphicsScene::fpsTimerFired)

7982{

8083 ASSERT(isMainThread());

    String showFPSEnvironment = getenv("WEBKIT_SHOW_FPS");

    bool ok = false;

    m_fpsInterval = showFPSEnvironment.toDouble(&ok);

    if (ok && m_fpsInterval) {

        ensureRootLayer();

        TextureMapperLayer* layer = toTextureMapperLayer(rootLayer());

        if (layer) {

            layer->setShowFPS(true);

            m_fpsTimer.startRepeating(m_fpsInterval);

        }

    }

}

CoordinatedGraphicsScene::~CoordinatedGraphicsScene()

@@void CoordinatedGraphicsScene::paintToCurrentGLContext(const TransformationMatri

    layer->paint();

    m_textureMapper->endClip();

    m_textureMapper->endPainting();

144 m_paintCount++;

    if (layer->descendantsOrSelfHaveRunningAnimations())

        dispatchOnMainThread(bind(&CoordinatedGraphicsScene::updateViewport, this));

@@void CoordinatedGraphicsScene::paintToGraphicsContext(cairo_t* painter)

    layer->paint();

    m_textureMapper->endPainting();

    m_textureMapper->setGraphicsContext(0);

196 m_paintCount++;

}

void CoordinatedGraphicsScene::setContentsSize(const FloatSize& contentsSize)

@@void CoordinatedGraphicsScene::setBackgroundColor(const Color& color)

    m_backgroundColor = color;

}

void CoordinatedGraphicsScene::fpsTimerFired(SceneTimer*)

{

    TextureMapperLayer* layer = toTextureMapperLayer(rootLayer());

    layer->setFPS((int)(m_paintCount / m_fpsInterval));

    m_paintCount = 0;

}

} // namespace WebCore

#endif // USE(COORDINATED_GRAPHICS)

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

@@private:

    typedef HashMap<int, RefPtr<CustomFilterProgram> > CustomFilterProgramMap;

    CustomFilterProgramMap m_customFilterPrograms;

#endif

    int m_paintCount;

    double m_fpsInterval;

    typedef Timer<CoordinatedGraphicsScene> SceneTimer;

    void fpsTimerFired(SceneTimer*);

    SceneTimer m_fpsTimer;

};

} // namespace WebCore