1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
commit d5562dbcfd63
Author: Henri Sivonen <hsivonen@hsivonen.fi>
Date: Fri Dec 1 10:45:25 2017 -0500
Bug 1409951 - Use a stack to end serializer contexts instead of recomputing them. r=smaug, a=gchang
MozReview-Commit-ID: FOd8AUmtYyA
--HG--
extra : rebase_source : 1f02ebc32fe80591d617f27ec70094a109ead2b0
extra : source : b0a3a621f5c85b5e9a4eb97de77fcb2558ac17c6
---
dom/base/nsDocumentEncoder.cpp | 56 +++++++++++++++++++-------------------
dom/base/nsPlainTextSerializer.cpp | 1 +
2 files changed, 29 insertions(+), 28 deletions(-)
diff --git dom/base/nsDocumentEncoder.cpp dom/base/nsDocumentEncoder.cpp
index 5912d67da86e..2fb488750366 100644
--- dom/base/nsDocumentEncoder.cpp
+++ dom/base/nsDocumentEncoder.cpp
@@ -49,6 +49,7 @@
#include "mozilla/dom/Element.h"
#include "mozilla/dom/ShadowRoot.h"
#include "nsLayoutUtils.h"
+#include "mozilla/ScopeExit.h"
using namespace mozilla;
using namespace mozilla::dom;
@@ -92,8 +93,8 @@ protected:
int32_t aDepth);
nsresult SerializeRangeContextStart(const nsTArray<nsINode*>& aAncestorArray,
nsAString& aString);
- nsresult SerializeRangeContextEnd(const nsTArray<nsINode*>& aAncestorArray,
- nsAString& aString);
+ nsresult SerializeRangeContextEnd(nsAString& aString);
+
virtual int32_t
GetImmediateContextCount(const nsTArray<nsINode*>& aAncestorArray)
{
@@ -185,6 +186,7 @@ protected:
AutoTArray<int32_t, 8> mStartOffsets;
AutoTArray<nsIContent*, 8> mEndNodes;
AutoTArray<int32_t, 8> mEndOffsets;
+ AutoTArray<AutoTArray<nsINode*, 8>, 8> mRangeContexts;
// Whether the serializer cares about being notified to scan elements to
// keep track of whether they are preformatted. This stores the out
// argument of nsIContentSerializer::Init().
@@ -874,6 +876,9 @@ nsDocumentEncoder::SerializeRangeContextStart(const nsTArray<nsINode*>& aAncesto
if (mDisableContextSerialize) {
return NS_OK;
}
+
+ AutoTArray<nsINode*, 8>* serializedContext = mRangeContexts.AppendElement();
+
int32_t i = aAncestorArray.Length(), j;
nsresult rv = NS_OK;
@@ -889,7 +894,7 @@ nsDocumentEncoder::SerializeRangeContextStart(const nsTArray<nsINode*>& aAncesto
// Either a general inclusion or as immediate context
if (IncludeInContext(node) || i < j) {
rv = SerializeNodeStart(node, 0, -1, aString);
-
+ serializedContext->AppendElement(node);
if (NS_FAILED(rv))
break;
}
@@ -899,34 +904,24 @@ nsDocumentEncoder::SerializeRangeContextStart(const nsTArray<nsINode*>& aAncesto
}
nsresult
-nsDocumentEncoder::SerializeRangeContextEnd(const nsTArray<nsINode*>& aAncestorArray,
- nsAString& aString)
+nsDocumentEncoder::SerializeRangeContextEnd(nsAString& aString)
{
if (mDisableContextSerialize) {
return NS_OK;
}
- int32_t i = 0, j;
- int32_t count = aAncestorArray.Length();
- nsresult rv = NS_OK;
- // currently only for table-related elements
- j = GetImmediateContextCount(aAncestorArray);
+ MOZ_RELEASE_ASSERT(!mRangeContexts.IsEmpty(), "Tried to end context without starting one.");
+ AutoTArray<nsINode*, 8>& serializedContext = mRangeContexts.LastElement();
- while (i < count) {
- nsINode *node = aAncestorArray.ElementAt(i++);
+ nsresult rv = NS_OK;
+ for (nsINode* node : Reversed(serializedContext)) {
+ rv = SerializeNodeEnd(node, aString);
- if (!node)
+ if (NS_FAILED(rv))
break;
-
- // Either a general inclusion or as immediate context
- if (IncludeInContext(node) || i - 1 < j) {
- rv = SerializeNodeEnd(node, aString);
-
- if (NS_FAILED(rv))
- break;
- }
}
+ mRangeContexts.RemoveElementAt(mRangeContexts.Length() - 1);
return rv;
}
@@ -992,7 +987,7 @@ nsDocumentEncoder::SerializeRangeToString(nsRange *aRange,
rv = SerializeRangeNodes(aRange, mCommonParent, aOutputString, 0);
NS_ENSURE_SUCCESS(rv, rv);
}
- rv = SerializeRangeContextEnd(mCommonAncestors, aOutputString);
+ rv = SerializeRangeContextEnd(aOutputString);
NS_ENSURE_SUCCESS(rv, rv);
return rv;
@@ -1029,6 +1024,11 @@ NS_IMETHODIMP
nsDocumentEncoder::EncodeToStringWithMaxLength(uint32_t aMaxLength,
nsAString& aOutputString)
{
+ MOZ_ASSERT(mRangeContexts.IsEmpty(), "Re-entrant call to nsDocumentEncoder.");
+ auto rangeContextGuard = MakeScopeExit([&] {
+ mRangeContexts.Clear();
+ });
+
if (!mDocument)
return NS_ERROR_NOT_INITIALIZED;
@@ -1112,10 +1112,8 @@ nsDocumentEncoder::EncodeToStringWithMaxLength(uint32_t aMaxLength,
prevNode = node;
} else if (prevNode) {
// Went from a <tr> to a non-<tr>
- mCommonAncestors.Clear();
- nsContentUtils::GetAncestors(p->GetParentNode(), mCommonAncestors);
mDisableContextSerialize = false;
- rv = SerializeRangeContextEnd(mCommonAncestors, output);
+ rv = SerializeRangeContextEnd(output);
NS_ENSURE_SUCCESS(rv, rv);
prevNode = nullptr;
}
@@ -1134,10 +1132,8 @@ nsDocumentEncoder::EncodeToStringWithMaxLength(uint32_t aMaxLength,
nsCOMPtr<nsINode> p = do_QueryInterface(prevNode);
rv = SerializeNodeEnd(p, output);
NS_ENSURE_SUCCESS(rv, rv);
- mCommonAncestors.Clear();
- nsContentUtils::GetAncestors(p->GetParentNode(), mCommonAncestors);
mDisableContextSerialize = false;
- rv = SerializeRangeContextEnd(mCommonAncestors, output);
+ rv = SerializeRangeContextEnd(output);
NS_ENSURE_SUCCESS(rv, rv);
}
@@ -1196,6 +1192,10 @@ nsDocumentEncoder::EncodeToStringWithMaxLength(uint32_t aMaxLength,
NS_IMETHODIMP
nsDocumentEncoder::EncodeToStream(nsIOutputStream* aStream)
{
+ MOZ_ASSERT(mRangeContexts.IsEmpty(), "Re-entrant call to nsDocumentEncoder.");
+ auto rangeContextGuard = MakeScopeExit([&] {
+ mRangeContexts.Clear();
+ });
nsresult rv = NS_OK;
if (!mDocument)
diff --git dom/base/nsPlainTextSerializer.cpp dom/base/nsPlainTextSerializer.cpp
index 189469f73bb6..d7ddb0274be5 100644
--- dom/base/nsPlainTextSerializer.cpp
+++ dom/base/nsPlainTextSerializer.cpp
@@ -388,6 +388,7 @@ nsPlainTextSerializer::ScanElementForPreformat(Element* aElement)
NS_IMETHODIMP
nsPlainTextSerializer::ForgetElementForPreformat(Element* aElement)
{
+ MOZ_RELEASE_ASSERT(!mPreformatStack.empty(), "Tried to pop without previous push.");
mPreformatStack.pop();
return NS_OK;
}
|
