Changeset 56183 in webkit

Timestamp:

Mar 18, 2010 1:07:13 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-18 Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Add an overlay QGraphicsTextItem to QtLauncher so we can display FPS info
on the launcher and not on the terminal anymore.

[Qt] QtLauncher's FPS info should be displayed on an overlay text item
​https://bugs.webkit.org/show_bug.cgi?id=36244

• QtLauncher/webview.cpp: (WebViewGraphicsBased::WebViewGraphicsBased): (WebViewGraphicsBased::setFrameRateMeasurementEnabled): (WebViewGraphicsBased::updateFrameRate):
• QtLauncher/webview.h:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/webview.cpp (modified) (5 diffs)
• QtLauncher/webview.h (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-18  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add an overlay QGraphicsTextItem to QtLauncher so we can display FPS info
+        on the launcher and not on the terminal anymore.
+
+        [Qt] QtLauncher's FPS info should be displayed on an overlay text item
+        https://bugs.webkit.org/show_bug.cgi?id=36244
+
+        * QtLauncher/webview.cpp:
+        (WebViewGraphicsBased::WebViewGraphicsBased):
+        (WebViewGraphicsBased::setFrameRateMeasurementEnabled):
+        (WebViewGraphicsBased::updateFrameRate):
+        * QtLauncher/webview.h:
+
 2010-03-18  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/QtLauncher/webview.cpp

@@ -43 +43 @@
     , m_measureFps(false)
     , m_resizesToContents(false)
+    , m_fpsTextItem(0)
 {
     setScene(new QGraphicsScene(this));
@@ -78 +79 @@
     m_updateTimer->setInterval(1000);
     connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(updateFrameRate()));
+
+    m_fpsTextItem = new GraphicsTextItem("[FPS] average: 0, current: 0", m_item);
+    m_fpsTextItem->setDefaultTextColor(QColor(Qt::red));
+    m_fpsTextItem->setVisible(false);
 }
 
@@ -100 +105 @@
     QRectF rect(QPoint(0, 0), event->size());
     m_item->setGeometry(rect);
+
+    m_fpsTextItem->setPos(m_item->size().width() - m_fpsTextItem->boundingRect().width() - 20,
+            m_item->size().height() - m_fpsTextItem->boundingRect().height() - 20);
 }
 
@@ -108 +116 @@
         m_lastConsultTime = m_startTime = QTime::currentTime();
         m_updateTimer->start();
-    } else 
+        m_fpsTextItem->setVisible(true);
+    } else {
         m_updateTimer->stop();
+        m_fpsTextItem->setVisible(false);
+    }
 }
 
@@ -122 +133 @@
     int current = interval ? m_numPaintsSinceLastMeasure * 1000 / interval : 0;
 
-    qDebug("[FPS] average: %d, current: %d", average, current);
+    QString fpsText;
+    QTextStream text(&fpsText);
+    text << "[FPS] average: " << average << ", current: " << current;
+    m_fpsTextItem->setPlainText(fpsText);
 
     m_lastConsultTime = now;

trunk/WebKitTools/QtLauncher/webview.h

@@ -65 +65 @@
 
 
+class GraphicsTextItem : public QGraphicsTextItem {
+    Q_OBJECT
+
+public:
+    GraphicsTextItem(const QString& text, QGraphicsItem* parent = 0) : QGraphicsTextItem(text, parent) {}
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *style,
+               QWidget *widget)
+    {
+        painter->fillRect(boundingRect(), QColor(0, 0, 0, 255));
+        QGraphicsTextItem::paint(painter, style, widget);
+    }
+};
+
+
 class WebViewGraphicsBased : public QGraphicsView {
     Q_OBJECT
@@ -77 +92 @@
 
     void setFrameRateMeasurementEnabled(bool enabled);
-    bool frameRateMeasurementEnabled() { return m_measureFps; } 
+    bool frameRateMeasurementEnabled() { return m_measureFps; }
 
     virtual void paintEvent(QPaintEvent* event);
-    
+
     void setResizesToContents(bool b);
 
@@ -119 +134 @@
     qreal m_yRotation;
     bool m_resizesToContents;
+    GraphicsTextItem* m_fpsTextItem;
 };