Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1643721: part 9) Remove redundant mRangeNodeContext from RangeSerializer. r=masayuki

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D79120
This commit is contained in:
Mirko Brodesser 2020-06-12 08:54:33 +00:00
parent 940c150e93
commit 5410d5645c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/base/nsDocumentEncoder.cpp
View File

@ -407,12 +407,10 @@ class nsDocumentEncoder : public nsIDocumentEncoder {
// @param aFlags multiple of the flags defined in nsIDocumentEncoder.idl.
RangeSerializer(const uint32_t& aFlags,
const NodeSerializer& aNodeSerializer,
const RangeNodeContext& aRangeNodeContext,
RangeContextSerializer& aRangeContextSerializer)
: mStartRootIndex{0},
mEndRootIndex{0},
mHaltRangeHint{false},
mRangeNodeContext{aRangeNodeContext},
mFlags{aFlags},
mNodeSerializer{aNodeSerializer},
mRangeContextSerializer{aRangeContextSerializer} {}
@ -441,8 +439,6 @@ class nsDocumentEncoder : public nsIDocumentEncoder {
bool mHaltRangeHint;
ContextInfoDepth mContextInfoDepth;
const RangeNodeContext& mRangeNodeContext;
// Multiple of the flags defined in nsIDocumentEncoder.idl.
const uint32_t& mFlags;
@ -485,8 +481,7 @@ nsDocumentEncoder::nsDocumentEncoder(
mTextStreamer),
mRangeNodeContext(std::move(aRangeNodeContext)),
mRangeContextSerializer(*mRangeNodeContext, mNodeSerializer),
mRangeSerializer(mFlags, mNodeSerializer, *mRangeNodeContext,
mRangeContextSerializer) {
mRangeSerializer(mFlags, mNodeSerializer, mRangeContextSerializer) {
MOZ_ASSERT(mRangeNodeContext);
Initialize();
@ -1014,7 +1009,7 @@ nsresult nsDocumentEncoder::RangeSerializer::SerializeRangeNodes(
NS_ENSURE_SUCCESS(rv, rv);
} else {
if (aNode != mClosestCommonInclusiveAncestorOfRange) {
if (mRangeNodeContext.IncludeInContext(aNode)) {
if (mRangeContextSerializer.mRangeNodeContext.IncludeInContext(aNode)) {
// halt the incrementing of mContextInfoDepth. This
// is so paste client will include this node in paste.
mHaltRangeHint = true;