1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QTextDocument: avoid relocations

Browse Source 
Hand-roll a string table here, since there's opportunity for
sharing string data between string entries.

Effects on Linux AMD64 GCC 4.9-trunk release stripped:
  text:   -88B
  data:   -64B
  relocs:  -5

Maintainability is hurt somewhat, but it is expected that the
contents of this string table do not change much, so the
overall effect is still very low.

Change-Id: I2a22da4c8548c53ef31c33319b4652f3cb6f62f5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Marc Mutz 2013-10-11 00:12:27 +02:00 committed by The Qt Project
parent 883444f16b
commit e14503d353
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/text/qtextdocument.cpp
View File

@ -2160,13 +2160,21 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format)
html += QLatin1String("pt;"); html += QLatin1String("pt;");
attributesEmitted = true; attributesEmitted = true;
} else if (format.hasProperty(QTextFormat::FontSizeAdjustment)) { } else if (format.hasProperty(QTextFormat::FontSizeAdjustment)) {
static const char * const sizeNames[] = { static const char sizeNameData[] =
"small", "medium", "large", "x-large", "xx-large" "small" "\0"
"medium" "\0"
"xx-large" ;
static const quint8 sizeNameOffsets[] = {
0, // "small"
sizeof("small"), // "medium"
sizeof("small") + sizeof("medium") + 3, // "large" )
sizeof("small") + sizeof("medium") + 1, // "x-large" )> compressed into "xx-large"
sizeof("small") + sizeof("medium"), // "xx-large" )
}; };
const char *name = 0; const char *name = 0;
const int idx = format.intProperty(QTextFormat::FontSizeAdjustment) + 1; const int idx = format.intProperty(QTextFormat::FontSizeAdjustment) + 1;
if (idx >= 0 && idx <= 4) { if (idx >= 0 && idx <= 4) {
name = sizeNames[idx]; name = sizeNameData + sizeNameOffsets[idx];
} }
if (name) { if (name) {
html += QLatin1String(" font-size:"); html += QLatin1String(" font-size:");