Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1280887 - patch 3 - Get rid of the mTextRunsToDelete array now that the frame's textruns are refcounted and will know when to die by themselves. r=mats

Browse Source
This commit is contained in:
Jonathan Kew 2016-08-19 13:14:37 +01:00
parent 95a82f84cc
commit 0cb66c8d3a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsTextFrame.cpp
View File

@ -966,7 +966,6 @@ public:
}
~BuildTextRunsScanner() {
NS_ASSERTION(mBreakSinks.IsEmpty(), "Should have been cleared");
NS_ASSERTION(mTextRunsToDelete.IsEmpty(), "Should have been cleared");
NS_ASSERTION(mLineBreakBeforeFrames.IsEmpty(), "Should have been cleared");
NS_ASSERTION(mMappedFlows.IsEmpty(), "Should have been cleared");
}
@ -1106,7 +1105,6 @@ private:
AutoTArray<MappedFlow,10> mMappedFlows;
AutoTArray<nsTextFrame*,50> mLineBreakBeforeFrames;
AutoTArray<UniquePtr<BreakSink>,10> mBreakSinks;
AutoTArray<RefPtr<gfxTextRun>,5> mTextRunsToDelete;
nsLineBreaker mLineBreaker;
RefPtr<gfxTextRun> mCurrentFramesAllSameTextRun;
DrawTarget* mDrawTarget;
@ -1622,7 +1620,6 @@ void BuildTextRunsScanner::FlushLineBreaks(gfxTextRun* aTrailingTextRun)
mBreakSinks[i]->Finish(mMissingFonts);
}
mBreakSinks.Clear();
mTextRunsToDelete.Clear();
}
void BuildTextRunsScanner::AccumulateRunInfo(nsTextFrame* aFrame)
@ -2373,9 +2370,6 @@ BuildTextRunsScanner::BuildTextRunForFrames(void* aTextBuffer)
// pointers around.
textRun->SetUserData(nullptr);
DestroyUserData(userDataToDestroy);
// Arrange for this textrun to be deleted the next time the linebreaker
// is flushed out
mTextRunsToDelete.AppendElement(Move(textRun));
return nullptr;
}