corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 570898 - Defer isindex prompt reading until after startup. r=jonas.

Browse Source
This commit is contained in:
Henri Sivonen
2010-06-11 18:08:13 +03:00
parent f356c5e921
commit ba3526f337
9 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
parser/html/nsHtml5TreeOperation.cpp
View File

@@ -133,7 +133,7 @@ nsHtml5TreeOperation::~nsHtml5TreeOperation()
}
nsresult
nsHtml5TreeOperation::AppendTextToTextNode(PRUnichar* aBuffer,
nsHtml5TreeOperation::AppendTextToTextNode(const PRUnichar* aBuffer,
PRInt32 aLength,
nsIContent* aTextNode,
nsHtml5TreeOpExecutor* aBuilder)
@@ -165,7 +165,7 @@ nsHtml5TreeOperation::AppendTextToTextNode(PRUnichar* aBuffer,
nsresult
nsHtml5TreeOperation::AppendText(PRUnichar* aBuffer,
nsHtml5TreeOperation::AppendText(const PRUnichar* aBuffer,
PRInt32 aLength,
nsIContent* aParent,
nsHtml5TreeOpExecutor* aBuilder)
@@ -479,6 +479,22 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
PRInt32 length = mInt;
return AppendText(buffer, length, parent, aBuilder);
}
case eTreeOpAppendIsindexPrompt: {
nsIContent* parent = *mOne.node;
nsXPIDLString prompt;
nsresult rv =
nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES,
"IsIndexPromptWithSpace", prompt);
PRUint32 len = prompt.Length();
if (NS_FAILED(rv)) {
return rv;
}
if (!len) {
// Don't bother appending a zero-length text node.
return NS_OK;
}
return AppendText(prompt.BeginReading(), len, parent, aBuilder);
}
case eTreeOpFosterParentText: {
nsIContent* stackParent = *mOne.node;
PRUnichar* buffer = mTwo.unicharPtr;