From f3c12fedad6b9dd1917c329059b4c05175c03130 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 2 Jul 2010 12:51:13 +1000
Subject: Optimize QDeclarativeStyledText.

Don't set the base font, as this is an expensive operation. The base
font will automatically be merged in by the text engine.
---
 src/declarative/util/qdeclarativestyledtext.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp
index babd71b..9b4955e 100644
--- a/src/declarative/util/qdeclarativestyledtext.cpp
+++ b/src/declarative/util/qdeclarativestyledtext.cpp
@@ -152,8 +152,6 @@ void QDeclarativeStyledTextPrivate::parse()
                 QTextCharFormat format;
                 if (formatStack.count())
                     format = formatStack.top();
-                else
-                    format.setFont(baseFont);
                 if (parseTag(ch, text, drawText, format))
                     formatStack.push(format);
             }
-- 
cgit v0.12


From 0085cfa78a712a7afbbbeb90a3d1149328b4d2fd Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Mon, 5 Jul 2010 10:14:00 +1000
Subject: Add styled text layout benchmark.

---
 tests/benchmarks/gui/text/qtext/main.cpp | 41 ++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp
index eaa23e9..63daae0 100644
--- a/tests/benchmarks/gui/text/qtext/main.cpp
+++ b/tests/benchmarks/gui/text/qtext/main.cpp
@@ -84,9 +84,11 @@ private slots:
 
     void newLineReplacement();
     void formatManipulation();
+    void fontResolution();
 
     void layout_data();
     void layout();
+    void formattedLayout();
     void paintLayoutToPixmap();
     void paintLayoutToPixmap_painterFill();
 
@@ -306,6 +308,18 @@ void tst_QText::formatManipulation()
     }
 }
 
+void tst_QText::fontResolution()
+{
+    QFont font;
+    QFont font2;
+    font.setFamily("DejaVu");
+    font2.setBold(true);
+
+    QBENCHMARK {    
+        QFont res = font.resolve(font2);
+    }
+}
+
 void tst_QText::layout_data()
 {
     QTest::addColumn<bool>("wrap");
@@ -339,6 +353,33 @@ void tst_QText::layout()
     }
 }*/
 
+void tst_QText::formattedLayout()
+{
+    //set up formatting
+    QList<QTextLayout::FormatRange> ranges;
+    {
+        QTextCharFormat format;
+        format.setForeground(QColor("steelblue"));
+
+        QTextLayout::FormatRange formatRange;
+        formatRange.format = format;
+        formatRange.start = 0;
+        formatRange.length = 50;
+
+        ranges.append(formatRange);
+    }
+
+    QTextLayout layout(m_shortLorem);
+    layout.setAdditionalFormats(ranges);
+    setupTextLayout(&layout);
+
+    QBENCHMARK {
+        QTextLayout layout(m_shortLorem);
+        layout.setAdditionalFormats(ranges);
+        setupTextLayout(&layout);
+    }
+}
+
 void tst_QText::paintLayoutToPixmap()
 {
     QTextLayout layout(m_shortLorem);
-- 
cgit v0.12


From e0dd90bfe47a7e95ad9444b4a62dc1f426dee7fe Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Mon, 5 Jul 2010 12:04:55 +1000
Subject: <br/> shouldn't trigger a new format range in QDeclarativeStyledText.

---
 src/declarative/util/qdeclarativestyledtext.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp
index 9b4955e..91566bc 100644
--- a/src/declarative/util/qdeclarativestyledtext.cpp
+++ b/src/declarative/util/qdeclarativestyledtext.cpp
@@ -196,8 +196,10 @@ bool QDeclarativeStyledTextPrivate::parseTag(const QChar *&ch, const QString &te
             if (char0 == QLatin1Char('b')) {
                 if (tagLength == 1)
                     format.setFontWeight(QFont::Bold);
-                else if (tagLength == 2 && tag.at(1) == QLatin1Char('r'))
+                else if (tagLength == 2 && tag.at(1) == QLatin1Char('r')) {
                     textOut.append(QChar(QChar::LineSeparator));
+                    return false;
+                }
             } else if (char0 == QLatin1Char('i')) {
                 if (tagLength == 1)
                     format.setFontItalic(true);
-- 
cgit v0.12