wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1125963 - Part 1: Fix serialization of the pre-wrap elements that Thunderbird relies on; r=bzbarsky

Browse Source 
This ensures that the plaintext serializer doesn't use the preformatted
text code path if we have encountered a pre-wrap element that
Thunderbird uses (which means setting white-space: pre-wrap and width:
NNch on the body element.)

It also ensures that we use 0 as the wrap column number passed down to
the plaintext serializer, instead of -1, which this code seems to be
unable to handle properly.
This commit is contained in:
Ehsan Akhgari 2015-02-26 15:26:12 -05:00
parent 08abd3d433
commit 951174421d
5 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/nsPlainTextSerializer.cpp
View File

@ -1556,14 +1556,14 @@ nsPlainTextSerializer::Write(const nsAString& aStr)
// We have two major codepaths here. One that does preformatted text and one
// that does normal formatted text. The one for preformatted text calls
// Output directly while the other code path goes through AddToLine.
if ((mPreFormatted && !mWrapColumn) || IsInPre()
if ((mPreFormatted && !mWrapColumn) || (IsInPre() && !mPreFormatted)
|| ((mSpanLevel > 0 || mDontWrapAnyQuotes)
&& mEmptyLines >= 0 && str.First() == char16_t('>'))) {
// No intelligent wrapping.
// This mustn't be mixed with intelligent wrapping without clearing
// the mCurrentLine buffer before!!!
NS_ASSERTION(mCurrentLine.IsEmpty() || IsInPre(),
NS_ASSERTION(mCurrentLine.IsEmpty() || (IsInPre() && !mPreFormatted),
"Mixed wrapping data and nonwrapping data on the same line");
if (!mCurrentLine.IsEmpty()) {
FlushLine();

36
dom/base/test/TestPlainTextSerializer.cpp
View File

@ -162,6 +162,39 @@ TestBlockElement()
return NS_OK;
}
nsresult
TestPreWrapElementForThunderbird()
{
// This test examines the magic pre-wrap setup that Thunderbird relies on.
nsString test;
test.AppendLiteral(
"<html>" NS_LINEBREAK
"<body style=\"white-space: pre-wrap; width: 10ch;\">" NS_LINEBREAK
"<pre>" NS_LINEBREAK
" first line is too long" NS_LINEBREAK
" second line is even loooonger " NS_LINEBREAK
"</pre>" NS_LINEBREAK
"</body>" NS_LINEBREAK "</html>");
ConvertBufToPlainText(test, nsIDocumentEncoder::OutputWrap);
// "\n\n first\nline is\ntoo long\n second\nline is\neven\nloooonger\n\n\n"
if (!test.EqualsLiteral(NS_LINEBREAK NS_LINEBREAK
" first" NS_LINEBREAK
"line is" NS_LINEBREAK
"too long" NS_LINEBREAK
" second" NS_LINEBREAK
"line is" NS_LINEBREAK
"even" NS_LINEBREAK
"loooonger" NS_LINEBREAK
NS_LINEBREAK NS_LINEBREAK)) {
fail("Wrong prettyprinted html to text serialization");
return NS_ERROR_FAILURE;
}
passed("prettyprinted HTML to text serialization test");
return NS_OK;
}
nsresult
TestPlainTextSerializer()
{
@ -191,6 +224,9 @@ TestPlainTextSerializer()
rv = TestBlockElement();
NS_ENSURE_SUCCESS(rv, rv);
rv = TestPreWrapElementForThunderbird();
NS_ENSURE_SUCCESS(rv, rv);
// Add new tests here...
return NS_OK;
}

2
dom/html/HTMLInputElement.cpp
View File

@ -7219,7 +7219,7 @@ HTMLInputElement::GetCols()
NS_IMETHODIMP_(int32_t)
HTMLInputElement::GetWrapCols()
{
return -1; // only textarea's can have wrap cols
return 0; // only textarea's can have wrap cols
}
NS_IMETHODIMP_(int32_t)

2
dom/html/HTMLTextAreaElement.cpp
View File

@ -1480,7 +1480,7 @@ HTMLTextAreaElement::GetWrapCols()
nsITextControlElement::GetWrapPropertyEnum(this, wrapProp);
if (wrapProp == nsITextControlElement::eHTMLTextWrap_Off) {
// do not wrap when wrap=off
return -1;
return 0;
}
// Otherwise we just wrap at the given number of columns

2
dom/html/nsTextEditorState.cpp
View File

@ -1713,7 +1713,7 @@ nsTextEditorState::InitializeRootNode()
nsAutoString classValue;
classValue.AppendLiteral("anonymous-div");
int32_t wrapCols = GetWrapCols();
if (wrapCols >= 0) {
if (wrapCols > 0) {
classValue.AppendLiteral(" wrap");
}
if (!IsSingleLineTextControl()) {