mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset e52d041dc3de (bug 1553378) for causing build bustages in ContentEventHandler.cpp. CLOSED TREE 

--HG--
extra : amend_source : 36025186ca5788f5889ff7d97252900eefab0a36
This commit is contained in:
Mihai Alexandru Michis 2019-05-24 14:32:27 +03:00
Родитель fa583b7a2f
Коммит 35449f0689
24 изменённых файлов: 163 добавлений и 141 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
dom/base/CharacterData.cpp
Просмотреть файл

@ -251,8 +251,7 @@ nsresult CharacterData::SetTextInternal(
Directionality oldDir = eDir_NotSet;
bool dirAffectsAncestor =
(NodeType() == TEXT_NODE &&
TextNodeWillChangeDirection(static_cast<nsTextNode*>(this), &oldDir,
aOffset));
TextNodeWillChangeDirection(this, &oldDir, aOffset));
if (aOffset == 0 && endOffset == textLength) {
// Replacing whole text or old text was empty. Don't bother to check for

6
dom/base/CharacterData.h
Просмотреть файл

@ -117,10 +117,10 @@ class CharacterData : public nsIContent {
}
const nsTextFragment* GetText() override { return &mText; }
uint32_t TextLength() const final { return TextDataLength(); }
const nsTextFragment& TextFragment() const { return mText; }
uint32_t TextDataLength() const { return mText.GetLength(); }
uint32_t TextLength() const final { return TextDataLength(); }
/**
* Set the text to the given value. If aNotify is true then
@ -197,6 +197,8 @@ class CharacterData : public nsIContent {
void ReplaceData(uint32_t aOffset, uint32_t aCount, const nsAString& aData,
ErrorResult& rv);
uint32_t TextDataLength() const { return mText.GetLength(); }
//----------------------------------------
#ifdef DEBUG

31
dom/base/DirectionalityUtils.cpp
Просмотреть файл

@ -378,14 +378,14 @@ static Directionality GetDirectionFromText(const char* aText,
return eDir_NotSet;
}
static Directionality GetDirectionFromText(const Text* aTextNode,
static Directionality GetDirectionFromText(const nsTextFragment* aFrag,
uint32_t* aFirstStrong = nullptr) {
const nsTextFragment* frag = &aTextNode->TextFragment();
if (frag->Is2b()) {
return GetDirectionFromText(frag->Get2b(), frag->GetLength(), aFirstStrong);
if (aFrag->Is2b()) {
return GetDirectionFromText(aFrag->Get2b(), aFrag->GetLength(),
aFirstStrong);
}
return GetDirectionFromText(frag->Get1b(), frag->GetLength(), aFirstStrong);
return GetDirectionFromText(aFrag->Get1b(), aFrag->GetLength(), aFirstStrong);
}
static nsTextNode* WalkDescendantsAndGetDirectionFromText(
@ -405,12 +405,12 @@ static nsTextNode* WalkDescendantsAndGetDirectionFromText(
for (uint32_t i = 0; i < assignedNodes.Length(); ++i) {
nsIContent* assignedNode = assignedNodes[i]->AsContent();
if (assignedNode->NodeType() == nsINode::TEXT_NODE) {
auto text = static_cast<nsTextNode*>(assignedNode);
if (assignedNode != aSkip) {
Directionality textNodeDir = GetDirectionFromText(text);
Directionality textNodeDir =
GetDirectionFromText(assignedNode->GetText());
if (textNodeDir != eDir_NotSet) {
*aDirectionality = textNodeDir;
return text;
return static_cast<nsTextNode*>(assignedNode);
}
}
} else if (assignedNode->IsElement() &&
@ -426,11 +426,10 @@ static nsTextNode* WalkDescendantsAndGetDirectionFromText(
}
if (child->NodeType() == nsINode::TEXT_NODE && child != aSkip) {
auto text = static_cast<nsTextNode*>(child);
Directionality textNodeDir = GetDirectionFromText(text);
Directionality textNodeDir = GetDirectionFromText(child->GetText());
if (textNodeDir != eDir_NotSet) {
*aDirectionality = textNodeDir;
return text;
return static_cast<nsTextNode*>(child);
}
}
child = child->GetNextNode(aRoot);
@ -1053,7 +1052,7 @@ void SetAncestorDirectionIfAuto(nsTextNode* aTextNode, Directionality aDir,
}
}
bool TextNodeWillChangeDirection(nsTextNode* aTextNode, Directionality* aOldDir,
bool TextNodeWillChangeDirection(nsIContent* aTextNode, Directionality* aOldDir,
uint32_t aOffset) {
if (!NodeAffectsDirAutoAncestor(aTextNode)) {
nsTextNodeDirectionalityMap::EnsureMapIsClearFor(aTextNode);
@ -1061,13 +1060,13 @@ bool TextNodeWillChangeDirection(nsTextNode* aTextNode, Directionality* aOldDir,
}
uint32_t firstStrong;
*aOldDir = GetDirectionFromText(aTextNode, &firstStrong);
*aOldDir = GetDirectionFromText(aTextNode->GetText(), &firstStrong);
return (aOffset <= firstStrong);
}
void TextNodeChangedDirection(nsTextNode* aTextNode, Directionality aOldDir,
bool aNotify) {
Directionality newDir = GetDirectionFromText(aTextNode);
Directionality newDir = GetDirectionFromText(aTextNode->GetText());
if (newDir == eDir_NotSet) {
if (aOldDir != eDir_NotSet && aTextNode->HasTextNodeDirectionalityMap()) {
// This node used to have a strong directional character but no
@ -1103,7 +1102,7 @@ void SetDirectionFromNewTextNode(nsTextNode* aTextNode) {
aTextNode->SetAncestorHasDirAuto();
}
Directionality dir = GetDirectionFromText(aTextNode);
Directionality dir = GetDirectionFromText(aTextNode->GetText());
if (dir != eDir_NotSet) {
SetAncestorDirectionIfAuto(aTextNode, dir);
}
@ -1115,7 +1114,7 @@ void ResetDirectionSetByTextNode(nsTextNode* aTextNode) {
return;
}
Directionality dir = GetDirectionFromText(aTextNode);
Directionality dir = GetDirectionFromText(aTextNode->GetText());
if (dir != eDir_NotSet && aTextNode->HasTextNodeDirectionalityMap()) {
nsTextNodeDirectionalityMap::ResetTextNodeDirection(aTextNode, aTextNode);
}

2
dom/base/DirectionalityUtils.h
Просмотреть файл

@ -96,7 +96,7 @@ void WalkDescendantsClearAncestorDirAuto(nsIContent* aContent);
*
* @return whether the text node affects the directionality of any element
*/
bool TextNodeWillChangeDirection(nsTextNode* aTextNode, Directionality* aOldDir,
bool TextNodeWillChangeDirection(nsIContent* aTextNode, Directionality* aOldDir,
uint32_t aOffset);
/**

4
dom/base/Selection.cpp
Просмотреть файл

@ -1474,8 +1474,8 @@ void Selection::SelectFramesForContent(nsIContent* aContent, bool aSelected) {
// as a text frame.
if (frame->IsTextFrame()) {
nsTextFrame* textFrame = static_cast<nsTextFrame*>(frame);
textFrame->SetSelectedRange(0, textFrame->TextFragment()->GetLength(),
aSelected, mSelectionType);
textFrame->SetSelectedRange(0, aContent->GetText()->GetLength(), aSelected,
mSelectionType);
} else {
frame->InvalidateFrameSubtree(); // frame continuations?
}

3
dom/base/nsContentUtils.cpp
Просмотреть файл

@ -9057,7 +9057,8 @@ bool nsContentUtils::SerializeNodeToMarkup(nsINode* aRoot,
case nsINode::TEXT_NODE:
case nsINode::CDATA_SECTION_NODE: {
const nsTextFragment* text = &current->AsText()->TextFragment();
const nsTextFragment* text =
static_cast<nsIContent*>(current)->GetText();
nsIContent* parent = current->GetParent();
if (ShouldEscape(parent)) {
AppendEncodedCharacters(text, builder);

4
dom/base/nsRange.cpp
Просмотреть файл

@ -2875,7 +2875,7 @@ void nsRange::CollectClientRectsAndText(
if (node == startContainer) {
int32_t offset = startContainer == endContainer
? static_cast<int32_t>(aEndOffset)
: content->AsText()->TextDataLength();
: content->GetText()->GetLength();
GetPartialTextRect(aCollector, aTextList, content,
static_cast<int32_t>(aStartOffset), offset,
aClampToEdge, aFlushLayout);
@ -2989,7 +2989,7 @@ nsresult nsRange::GetUsedFontFaces(nsLayoutUtils::UsedFontFaceList& aResult,
if (node == startContainer) {
int32_t offset = startContainer == endContainer
? mEnd.Offset()
: content->AsText()->TextDataLength();
: content->GetText()->GetLength();
nsLayoutUtils::GetFontFacesForText(frame, mStart.Offset(), offset, true,
aResult, fontFaces, aMaxRanges,
aSkipCollapsedWhitespace);

74
dom/events/ContentEventHandler.cpp
Просмотреть файл

@ -506,19 +506,33 @@ static void ConvertToNativeNewlines(nsString& aString) {
#endif
}
static void AppendString(nsAString& aString, Text* aText) {
aText->TextFragment().AppendTo(aString);
static void AppendString(nsAString& aString, nsIContent* aContent) {
NS_ASSERTION(aContent->IsText(), "aContent is not a text node!");
const nsTextFragment* text = aContent->GetText();
if (!text) {
return;
}
text->AppendTo(aString);
}
static void AppendSubString(nsAString& aString, Text* aText, uint32_t aXPOffset,
uint32_t aXPLength) {
aText->TextFragment().AppendTo(aString, int32_t(aXPOffset),
int32_t(aXPLength));
static void AppendSubString(nsAString& aString, nsIContent* aContent,
uint32_t aXPOffset, uint32_t aXPLength) {
NS_ASSERTION(aContent->IsText(), "aContent is not a text node!");
const nsTextFragment* text = aContent->GetText();
if (!text) {
return;
}
text->AppendTo(aString, int32_t(aXPOffset), int32_t(aXPLength));
}
#if defined(XP_WIN)
static uint32_t CountNewlinesInXPLength(Text* aText, uint32_t aXPLength) {
const nsTextFragment* text = aText->TextFragment();
static uint32_t CountNewlinesInXPLength(nsIContent* aContent,
uint32_t aXPLength) {
NS_ASSERTION(aContent->IsText(), "aContent is not a text node!");
const nsTextFragment* text = aContent->GetText();
if (!text) {
return 0;
}
// For automated tests, we should abort on debug build.
MOZ_ASSERT(aXPLength == UINT32_MAX || aXPLength <= text->GetLength(),
"aXPLength is out-of-bounds");
@ -532,9 +546,13 @@ static uint32_t CountNewlinesInXPLength(Text* aText, uint32_t aXPLength) {
return newlines;
}
static uint32_t CountNewlinesInNativeLength(Text* aText,
static uint32_t CountNewlinesInNativeLength(nsIContent* aContent,
uint32_t aNativeLength) {
const nsTextFragment* text = &aText->TextFragment();
NS_ASSERTION(aContent->IsText(), "aContent is not a text node!");
const nsTextFragment* text = aContent->GetText();
if (!text) {
return 0;
}
// For automated tests, we should abort on debug build.
MOZ_ASSERT(
(aNativeLength == UINT32_MAX || aNativeLength <= text->GetLength() * 2),
@ -566,9 +584,8 @@ uint32_t ContentEventHandler::GetNativeTextLength(nsIContent* aContent,
if (aStartOffset == aEndOffset) {
return 0;
}
return GetTextLength(aContent->AsText(), LINE_BREAK_TYPE_NATIVE, aEndOffset) -
GetTextLength(aContent->AsText(), LINE_BREAK_TYPE_NATIVE,
aStartOffset);
return GetTextLength(aContent, LINE_BREAK_TYPE_NATIVE, aEndOffset) -
GetTextLength(aContent, LINE_BREAK_TYPE_NATIVE, aStartOffset);
}
/* static */
@ -577,7 +594,7 @@ uint32_t ContentEventHandler::GetNativeTextLength(nsIContent* aContent,
if (NS_WARN_IF(!aContent->IsText())) {
return 0;
}
return GetTextLength(aContent->AsText(), LINE_BREAK_TYPE_NATIVE, aMaxLength);
return GetTextLength(aContent, LINE_BREAK_TYPE_NATIVE, aMaxLength);
}
/* static */
@ -613,7 +630,7 @@ uint32_t ContentEventHandler::GetTextLength(nsIContent* aContent,
// of the XP newline ("\n"), so XP length is equal to the length of the
// native offset plus the number of newlines encountered in the string.
(aLineBreakType == LINE_BREAK_TYPE_NATIVE)
? CountNewlinesInXPLength(aContent->AsText(), aMaxLength)
? CountNewlinesInXPLength(aContent, aMaxLength)
: 0;
#else
// On other platforms, the native and XP newlines are the same.
@ -634,8 +651,7 @@ static uint32_t ConvertToXPOffset(nsIContent* aContent,
// On Windows, the length of a native newline ("\r\n") is twice the length of
// the XP newline ("\n"), so XP offset is equal to the length of the native
// offset minus the number of newlines encountered in the string.
return aNativeOffset - CountNewlinesInNativeLength(aContent->AsText(),
aNativeOffset);
return aNativeOffset - CountNewlinesInNativeLength(aContent, aNativeOffset);
#else
// On other platforms, the native and XP newlines are the same.
return aNativeOffset;
@ -715,7 +731,8 @@ nsresult ContentEventHandler::GenerateFlatTextContent(
}
if (startNode == endNode && startNode->IsText()) {
AppendSubString(aString, startNode->AsText(), aRawRange.StartOffset(),
nsIContent* content = startNode->AsContent();
AppendSubString(aString, content, aRawRange.StartOffset(),
aRawRange.EndOffset() - aRawRange.StartOffset());
ConvertToNativeNewlines(aString);
return NS_OK;
@ -735,17 +752,18 @@ nsresult ContentEventHandler::GenerateFlatTextContent(
if (!node->IsContent()) {
continue;
}
nsIContent* content = node->AsContent();
if (node->IsText()) {
if (node == startNode) {
AppendSubString(aString, node->AsText(), aRawRange.StartOffset(),
node->AsText()->TextLength() - aRawRange.StartOffset());
} else if (node == endNode) {
AppendSubString(aString, node->AsText(), 0, aRawRange.EndOffset());
if (content->IsText()) {
if (content == startNode) {
AppendSubString(aString, content, aRawRange.StartOffset(),
content->TextLength() - aRawRange.StartOffset());
} else if (content == endNode) {
AppendSubString(aString, content, 0, aRawRange.EndOffset());
} else {
AppendString(aString, node->AsText());
AppendString(aString, content);
}
} else if (ShouldBreakLineBefore(node->AsContent(), mRootContent)) {
} else if (ShouldBreakLineBefore(content, mRootContent)) {
aString.Append(char16_t('\n'));
}
}
@ -983,7 +1001,7 @@ nsresult ContentEventHandler::ExpandToClusterBoundary(nsIContent* aContent,
}
// If the frame isn't available, we only can check surrogate pair...
const nsTextFragment* text = &aContent->AsText()->TextFragment();
const nsTextFragment* text = aContent->GetText();
NS_ENSURE_TRUE(text, NS_ERROR_FAILURE);
if (NS_IS_LOW_SURROGATE(text->CharAt(*aXPOffset)) &&
NS_IS_HIGH_SURROGATE(text->CharAt(*aXPOffset - 1))) {
@ -1846,7 +1864,7 @@ nsresult ContentEventHandler::OnQueryTextRectArray(
}
// Assign the characters whose rects are computed by the call of
// nsTextFrame::GetCharacterRectsInRange().
AppendSubString(chars, firstContent->AsText(), firstFrame.mOffsetInNode,
AppendSubString(chars, firstContent, firstFrame.mOffsetInNode,
charRects.Length());
if (NS_WARN_IF(chars.Length() != charRects.Length())) {
return NS_ERROR_UNEXPECTED;

2
dom/svg/SVGTextContentElement.cpp
Просмотреть файл

@ -83,7 +83,7 @@ Maybe<int32_t> SVGTextContentElement::GetNonLayoutDependentNumberOfChars() {
return Nothing();
}
const nsTextFragment* text = &n->AsText()->TextFragment();
const nsTextFragment* text = static_cast<nsTextNode*>(n)->GetText();
uint32_t length = text->GetLength();
if (text->Is2b()) {

2
editor/libeditor/HTMLEditRules.cpp
Просмотреть файл

@ -2429,7 +2429,7 @@ nsresult HTMLEditRules::WillDeleteSelection(
eo--;
// Bug 1068979: delete both codepoints if surrogate pair
if (so > 0) {
const nsTextFragment* text = &nodeAsText->TextFragment();
const nsTextFragment* text = nodeAsText->GetText();
if (NS_IS_LOW_SURROGATE(text->CharAt(so)) &&
NS_IS_HIGH_SURROGATE(text->CharAt(so - 1))) {
so--;

2
editor/libeditor/TextEditor.cpp
Просмотреть файл

@ -587,7 +587,7 @@ nsresult TextEditor::ExtendSelectionForDelete(nsIEditor::EDirection* aAction) {
if (insertionPoint.IsInTextNode()) {
const nsTextFragment* data =
&insertionPoint.GetContainerAsText()->TextFragment();
insertionPoint.GetContainerAsText()->GetText();
uint32_t offset = insertionPoint.Offset();
if ((offset > 1 && NS_IS_LOW_SURROGATE(data->CharAt(offset - 1)) &&
NS_IS_HIGH_SURROGATE(data->CharAt(offset - 2))) ||

18
editor/libeditor/WSRunObject.cpp
Просмотреть файл

@ -657,7 +657,7 @@ nsresult WSRunObject::GetWSNodes() {
// first look backwards to find preceding ws nodes
if (Text* textNode = mScanStartPoint.GetContainerAsText()) {
const nsTextFragment* textFrag = &textNode->TextFragment();
const nsTextFragment* textFrag = textNode->GetText();
mNodeArray.InsertElementAt(0, textNode);
if (!mScanStartPoint.IsStartOfContainer()) {
for (uint32_t i = mScanStartPoint.Offset(); i; i--) {
@ -701,10 +701,10 @@ nsresult WSRunObject::GetWSNodes() {
} else if (priorNode->IsText() && priorNode->IsEditable()) {
RefPtr<Text> textNode = priorNode->GetAsText();
mNodeArray.InsertElementAt(0, textNode);
if (!textNode) {
const nsTextFragment* textFrag;
if (!textNode || !(textFrag = textNode->GetText())) {
return NS_ERROR_NULL_POINTER;
}
const nsTextFragment* textFrag = &textNode->TextFragment();
uint32_t len = textNode->TextLength();
if (len < 1) {
@ -763,7 +763,7 @@ nsresult WSRunObject::GetWSNodes() {
// then look ahead to find following ws nodes
if (Text* textNode = mScanEndPoint.GetContainerAsText()) {
// don't need to put it on list. it already is from code above
const nsTextFragment* textFrag = &textNode->TextFragment();
const nsTextFragment* textFrag = textNode->GetText();
if (!mScanEndPoint.IsEndOfContainer()) {
for (uint32_t i = mScanEndPoint.Offset(); i < textNode->TextLength();
i++) {
@ -808,10 +808,10 @@ nsresult WSRunObject::GetWSNodes() {
} else if (nextNode->IsText() && nextNode->IsEditable()) {
RefPtr<Text> textNode = nextNode->GetAsText();
mNodeArray.AppendElement(textNode);
if (!textNode) {
const nsTextFragment* textFrag;
if (!textNode || !(textFrag = textNode->GetText())) {
return NS_ERROR_NULL_POINTER;
}
const nsTextFragment* textFrag = &textNode->TextFragment();
uint32_t len = textNode->TextLength();
if (len < 1) {
@ -1510,7 +1510,7 @@ nsresult WSRunObject::InsertNBSPAndRemoveFollowingASCIIWhitespaces(
// Now, the text node may have been modified by mutation observer.
// So, the NBSP may have gone.
if (aPoint.mTextNode->TextDataLength() <= aPoint.mOffset ||
aPoint.mTextNode->TextFragment().CharAt(aPoint.mOffset) != kNBSP) {
aPoint.mTextNode->GetText()->CharAt(aPoint.mOffset) != kNBSP) {
// This is just preparation of an edit action. Let's return NS_OK.
// XXX Perhaps, we should return another success code which indicates
// mutation observer touched the DOM tree. However, that should
@ -1640,11 +1640,11 @@ char16_t WSRunObject::GetCharAt(Text* aTextNode, int32_t aOffset) const {
// return 0 if we can't get a char, for whatever reason
NS_ENSURE_TRUE(aTextNode, 0);
int32_t len = int32_t(aTextNode->TextDataLength());
int32_t len = int32_t(aTextNode->TextLength());
if (aOffset < 0 || aOffset >= len) {
return 0;
}
return aTextNode->TextFragment().CharAt(aOffset);
return aTextNode->GetText()->CharAt(aOffset);
}
template <typename PT, typename CT>

2
layout/base/RestyleManager.cpp
Просмотреть файл

@ -286,7 +286,7 @@ void RestyleManager::CharacterDataChanged(
return;
}
const nsTextFragment* text = &aContent->AsText()->TextFragment();
const nsTextFragment* text = aContent->GetText();
const size_t oldLength = aInfo.mChangeStart;
const size_t newLength = text->GetLength();

4
layout/base/nsBidiPresUtils.cpp
Просмотреть файл

@ -1277,10 +1277,10 @@ bool nsBidiPresUtils::ChildListMayRequireBidi(nsIFrame* aFirstChild,
// Check whether the text frame has any RTL characters; if so, bidi
// resolution will be needed.
dom::Text* content = frame->GetContent()->AsText();
nsIContent* content = frame->GetContent();
if (content != *aCurrContent) {
*aCurrContent = content;
const nsTextFragment* txt = &content->TextFragment();
const nsTextFragment* txt = content->GetText();
if (txt->Is2b() &&
HasRTLChars(MakeSpan(txt->Get2b(), txt->GetLength()))) {
return true;

37
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -9989,24 +9989,35 @@ static int32_t FirstLetterCount(const nsTextFragment* aFragment) {
return count;
}
static bool NeedFirstLetterContinuation(Text* aText) {
MOZ_ASSERT(aText, "null ptr");
int32_t flc = FirstLetterCount(&aText->TextFragment());
int32_t tl = aText->TextDataLength();
return flc < tl;
static bool NeedFirstLetterContinuation(nsIContent* aContent) {
MOZ_ASSERT(aContent, "null ptr");
bool result = false;
if (aContent) {
const nsTextFragment* frag = aContent->GetText();
if (frag) {
int32_t flc = FirstLetterCount(frag);
int32_t tl = frag->GetLength();
if (flc < tl) {
result = true;
}
}
}
return result;
}
static bool IsFirstLetterContent(Text* aText) {
return aText->TextDataLength() && !aText->TextIsOnlyWhitespace();
static bool IsFirstLetterContent(nsIContent* aContent) {
return aContent->TextLength() && !aContent->TextIsOnlyWhitespace();
}
/**
* Create a letter frame, only make it a floating frame.
*/
nsFirstLetterFrame* nsCSSFrameConstructor::CreateFloatingLetterFrame(
nsFrameConstructorState& aState, Text* aTextContent, nsIFrame* aTextFrame,
nsContainerFrame* aParentFrame, ComputedStyle* aParentComputedStyle,
ComputedStyle* aComputedStyle, nsFrameList& aResult) {
nsFrameConstructorState& aState, nsIContent* aTextContent,
nsIFrame* aTextFrame, nsContainerFrame* aParentFrame,
ComputedStyle* aParentComputedStyle, ComputedStyle* aComputedStyle,
nsFrameList& aResult) {
MOZ_ASSERT(aParentComputedStyle);
nsFirstLetterFrame* letterFrame =
@ -10070,7 +10081,9 @@ nsFirstLetterFrame* nsCSSFrameConstructor::CreateFloatingLetterFrame(
*/
void nsCSSFrameConstructor::CreateLetterFrame(
nsContainerFrame* aBlockFrame, nsContainerFrame* aBlockContinuation,
Text* aTextContent, nsContainerFrame* aParentFrame, nsFrameList& aResult) {
nsIContent* aTextContent, nsContainerFrame* aParentFrame,
nsFrameList& aResult) {
MOZ_ASSERT(aTextContent->IsText(), "aTextContent isn't text");
NS_ASSERTION(aBlockFrame->IsBlockFrameOrSubclass(), "Not a block frame?");
// Get a ComputedStyle for the first-letter-frame.
@ -10204,7 +10217,7 @@ void nsCSSFrameConstructor::WrapFramesInFirstLetterFrame(
LayoutFrameType frameType = frame->Type();
if (LayoutFrameType::Text == frameType) {
// Wrap up first-letter content in a letter frame
Text* textContent = frame->GetContent()->AsText();
nsIContent* textContent = frame->GetContent();
if (IsFirstLetterContent(textContent)) {
// Create letter frame to wrap up the text
CreateLetterFrame(aBlockFrame, aBlockContinuation, textContent,

4
layout/base/nsCSSFrameConstructor.h
Просмотреть файл

@ -1920,14 +1920,14 @@ class nsCSSFrameConstructor final : public nsFrameManager {
// Methods support :first-letter style
nsFirstLetterFrame* CreateFloatingLetterFrame(
nsFrameConstructorState& aState, mozilla::dom::Text* aTextContent,
nsFrameConstructorState& aState, nsIContent* aTextContent,
nsIFrame* aTextFrame, nsContainerFrame* aParentFrame,
ComputedStyle* aParentComputedStyle, ComputedStyle* aComputedStyle,
nsFrameList& aResult);
void CreateLetterFrame(nsContainerFrame* aBlockFrame,
nsContainerFrame* aBlockContinuation,
mozilla::dom::Text* aTextContent,
nsIContent* aTextContent,
nsContainerFrame* aParentFrame, nsFrameList& aResult);
void WrapFramesInFirstLetterFrame(nsContainerFrame* aBlockFrame,

2
layout/base/nsLayoutUtils.cpp
Просмотреть файл

@ -9363,7 +9363,7 @@ void nsLayoutUtils::AppendFrameTextContent(nsIFrame* aFrame,
auto textFrame = static_cast<nsTextFrame*>(aFrame);
auto offset = textFrame->GetContentOffset();
auto length = textFrame->GetContentLength();
textFrame->TextFragment()->AppendTo(aResult, offset, length);
textFrame->GetContent()->GetText()->AppendTo(aResult, offset, length);
} else {
for (nsIFrame* child : aFrame->PrincipalChildList()) {
AppendFrameTextContent(child, aResult);

3
layout/forms/nsTextControlFrame.cpp
Просмотреть файл

@ -890,7 +890,8 @@ nsresult nsTextControlFrame::SelectAllOrCollapseToEndOfText(bool aSelect) {
child = child->GetPreviousSibling();
if (child && child->IsText()) {
rootNode = child;
numChildren = child->AsText()->TextDataLength();
const nsTextFragment* fragment = child->GetText();
numChildren = fragment ? fragment->GetLength() : 0;
}
}
}

7
layout/generic/nsFontInflationData.cpp
Просмотреть файл

@ -258,7 +258,7 @@ void nsFontInflationData::UpdateISize(const ReflowInput& aReflowInput) {
if (content && kid == content->GetPrimaryFrame()) {
uint32_t len = nsTextFrameUtils::
ComputeApproximateLengthWithWhitespaceCompression(
content->AsText(), kid->StyleText());
content, kid->StyleText());
if (len != 0) {
return kid;
}
@ -295,8 +295,7 @@ static uint32_t DoCharCountOfLargestOption(nsIFrame* aContainer) {
if (optionChild->IsTextFrame()) {
optionResult += nsTextFrameUtils::
ComputeApproximateLengthWithWhitespaceCompression(
optionChild->GetContent()->AsText(),
optionChild->StyleText());
optionChild->GetContent(), optionChild->StyleText());
}
}
}
@ -335,7 +334,7 @@ void nsFontInflationData::ScanTextIn(nsIFrame* aFrame) {
if (content && kid == content->GetPrimaryFrame()) {
uint32_t len = nsTextFrameUtils::
ComputeApproximateLengthWithWhitespaceCompression(
content->AsText(), kid->StyleText());
content, kid->StyleText());
if (len != 0) {
nscoord fontSize = kid->StyleFont()->mFont.size;
if (fontSize > 0) {

59
layout/generic/nsTextFrame.cpp
Просмотреть файл

@ -676,7 +676,7 @@ void GlyphObserver::NotifyGlyphsChanged() {
int32_t nsTextFrame::GetContentEnd() const {
nsTextFrame* next = GetNextContinuation();
return next ? next->GetContentOffset() : TextFragment()->GetLength();
return next ? next->GetContentOffset() : mContent->GetText()->GetLength();
}
struct FlowLengthProperty {
@ -716,7 +716,7 @@ int32_t nsTextFrame::GetInFlowContentLength() {
nsTextFrame* nextBidi = LastInFlow()->GetNextContinuation();
int32_t endFlow =
nextBidi ? nextBidi->GetContentOffset() : GetContent()->TextLength();
nextBidi ? nextBidi->GetContentOffset() : mContent->TextLength();
if (!flowLength) {
flowLength = new FlowLengthProperty;
@ -1047,7 +1047,7 @@ class BuildTextRunsScanner {
int32_t GetContentEnd() {
return mEndFrame ? mEndFrame->GetContentOffset()
: mStartFrame->TextFragment()->GetLength();
: mStartFrame->GetContent()->GetText()->GetLength();
}
};
@ -1306,7 +1306,7 @@ BuildTextRunsScanner::FindBoundaryResult BuildTextRunsScanner::FindBoundaries(
if (aState->mSeenSpaceForLineBreakingOnThisLine) {
return FB_CONTINUE;
}
const nsTextFragment* frag = textFrame->TextFragment();
const nsTextFragment* frag = textFrame->GetContent()->GetText();
uint32_t start = textFrame->GetContentOffset();
uint32_t length = textFrame->GetContentLength();
const void* text;
@ -1684,7 +1684,7 @@ void BuildTextRunsScanner::AccumulateRunInfo(nsTextFrame* aFrame) {
mMaxTextLength += aFrame->GetContentLength();
}
}
mDoubleByteText |= aFrame->TextFragment()->Is2b();
mDoubleByteText |= aFrame->GetContent()->GetText()->Is2b();
mLastFrame = aFrame;
mCommonAncestorWithLastFrame = aFrame->GetParent();
@ -1705,7 +1705,7 @@ void BuildTextRunsScanner::AccumulateRunInfo(nsTextFrame* aFrame) {
static bool HasTerminalNewline(const nsTextFrame* aFrame) {
if (aFrame->GetContentLength() == 0) return false;
const nsTextFragment* frag = aFrame->TextFragment();
const nsTextFragment* frag = aFrame->GetContent()->GetText();
return frag->CharAt(aFrame->GetContentEnd() - 1) == '\n';
}
@ -2244,7 +2244,7 @@ already_AddRefed<gfxTextRun> BuildTextRunsScanner::BuildTextRunForFrames(
// Figure out what content is included in this flow.
nsIContent* content = f->GetContent();
const nsTextFragment* frag = f->TextFragment();
const nsTextFragment* frag = content->GetText();
int32_t contentStart = mappedFlow->mStartFrame->GetContentOffset();
int32_t contentEnd = mappedFlow->GetContentEnd();
int32_t contentLength = contentEnd - contentStart;
@ -2523,7 +2523,8 @@ bool BuildTextRunsScanner::SetupLineBreakerContext(gfxTextRun* aTextRun) {
GetCSSWhitespaceToCompressionMode(f, textStyle);
// Figure out what content is included in this flow.
const nsTextFragment* frag = f->TextFragment();
nsIContent* content = f->GetContent();
const nsTextFragment* frag = content->GetText();
int32_t contentStart = mappedFlow->mStartFrame->GetContentOffset();
int32_t contentEnd = mappedFlow->GetContentEnd();
int32_t contentLength = contentEnd - contentStart;
@ -2578,7 +2579,7 @@ static bool HasCompressedLeadingWhitespace(
gfxSkipCharsIterator iter = aIterator;
int32_t frameContentOffset = aFrame->GetContentOffset();
const nsTextFragment* frag = aFrame->TextFragment();
const nsTextFragment* frag = aFrame->GetContent()->GetText();
while (frameContentOffset < aContentEndOffset &&
iter.IsOriginalCharSkipped()) {
if (IsTrimmableSpace(frag, frameContentOffset, aStyleText)) return true;
@ -3187,7 +3188,7 @@ class MOZ_STACK_CLASS PropertyProvider final
mFontGroup(nullptr),
mFontMetrics(aFontMetrics),
mTextStyle(aFrame->StyleText()),
mFrag(aFrame->TextFragment()),
mFrag(aFrame->GetContent()->GetText()),
mLineContainer(nullptr),
mFrame(aFrame),
mStart(aStart),
@ -4767,7 +4768,7 @@ void nsTextFrame::NotifyNativeAnonymousTextnodeChange(uint32_t aOldLength) {
info.mAppend = false;
info.mChangeStart = 0;
info.mChangeEnd = aOldLength;
info.mReplaceLength = GetContent()->TextLength();
info.mReplaceLength = mContent->TextLength();
CharacterDataChanged(info);
}
@ -7065,7 +7066,7 @@ nsIFrame::ContentOffsets nsTextFrame::GetCharacterOffsetAtFramePointInternal(
// ...but don't let selection/insertion-point split two Regional Indicator
// chars that are ligated in the textrun to form a single flag symbol.
uint32_t offs = extraCluster.GetOriginalOffset();
const nsTextFragment* frag = TextFragment();
const nsTextFragment* frag = GetContent()->GetText();
if (offs + 1 < frag->GetLength() &&
NS_IS_HIGH_SURROGATE(frag->CharAt(offs)) &&
NS_IS_LOW_SURROGATE(frag->CharAt(offs + 1)) &&
@ -7482,7 +7483,7 @@ nsIFrame::FrameSearchResult nsTextFrame::PeekOffsetNoAmount(bool aForward,
gfxSkipCharsIterator iter = EnsureTextRun(nsTextFrame::eInflated);
if (!mTextRun) return CONTINUE_EMPTY;
TrimmedOffsets trimmed = GetTrimmedOffsets(TextFragment());
TrimmedOffsets trimmed = GetTrimmedOffsets(mContent->GetText());
// Check whether there are nonskipped characters in the trimmmed range
return (iter.ConvertOriginalToSkipped(trimmed.GetEnd()) >
iter.ConvertOriginalToSkipped(trimmed.mStart))
@ -7543,7 +7544,7 @@ class MOZ_STACK_CLASS ClusterIterator {
static bool IsAcceptableCaretPosition(const gfxSkipCharsIterator& aIter,
bool aRespectClusters,
const gfxTextRun* aTextRun,
nsTextFrame* aFrame) {
nsIFrame* aFrame) {
if (aIter.IsOriginalCharSkipped()) return false;
uint32_t index = aIter.GetSkippedOffset();
if (aRespectClusters && !aTextRun->IsClusterStart(index)) return false;
@ -7555,7 +7556,7 @@ static bool IsAcceptableCaretPosition(const gfxSkipCharsIterator& aIter,
// this far because the low surrogate is also marked as non-clusterStart
// so we'll return FALSE above.)
uint32_t offs = aIter.GetOriginalOffset();
const nsTextFragment* frag = aFrame->TextFragment();
const nsTextFragment* frag = aFrame->GetContent()->GetText();
uint32_t ch = frag->CharAt(offs);
if (gfxFontUtils::IsVarSelector(ch) ||
@ -7607,7 +7608,7 @@ nsIFrame::FrameSearchResult nsTextFrame::PeekOffsetCharacter(
if (!mTextRun) return CONTINUE_EMPTY;
TrimmedOffsets trimmed =
GetTrimmedOffsets(TextFragment(), TrimmedOffsetFlags::NoTrimAfter);
GetTrimmedOffsets(mContent->GetText(), TrimmedOffsetFlags::NoTrimAfter);
// A negative offset means "end of frame".
int32_t startOffset =
@ -7740,7 +7741,7 @@ ClusterIterator::ClusterIterator(nsTextFrame* aTextFrame, int32_t aPosition,
}
mIterator.SetOriginalOffset(aPosition);
mFrag = aTextFrame->TextFragment();
mFrag = aTextFrame->GetContent()->GetText();
mTrimmed = aTextFrame->GetTrimmedOffsets(
mFrag, aTrimSpaces ? nsTextFrame::TrimmedOffsetFlags::Default
: nsTextFrame::TrimmedOffsetFlags::NoTrimAfter |
@ -8048,7 +8049,7 @@ void nsTextFrame::AddInlineMinISizeForFlow(gfxContext* aRenderingContext,
// Pass null for the line container. This will disable tab spacing, but that's
// OK since we can't really handle tabs for intrinsic sizing anyway.
const nsStyleText* textStyle = StyleText();
const nsTextFragment* frag = TextFragment();
const nsTextFragment* frag = mContent->GetText();
// If we're hyphenating, the PropertyProvider needs the actual length;
// otherwise we can just pass INT32_MAX to mean "all the text"
@ -8245,7 +8246,7 @@ void nsTextFrame::AddInlinePrefISizeForFlow(
// OK since we can't really handle tabs for intrinsic sizing anyway.
const nsStyleText* textStyle = StyleText();
const nsTextFragment* frag = TextFragment();
const nsTextFragment* frag = mContent->GetText();
PropertyProvider provider(textRun, textStyle, frag, this, iter, INT32_MAX,
nullptr, 0, aTextRunType);
@ -8774,7 +8775,7 @@ void nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
uint32_t flowEndInTextRun;
nsIFrame* lineContainer = aLineLayout.LineContainerFrame();
const nsTextFragment* frag = TextFragment();
const nsTextFragment* frag = mContent->GetText();
// DOM offsets of the text range we need to measure, after trimming
// whitespace, restricting to first-letter, and restricting preformatted text
@ -8798,7 +8799,7 @@ void nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
contentNewLineOffset = cachedNewlineOffset->mNewlineOffset;
} else {
contentNewLineOffset =
FindChar(frag, offset, GetContent()->TextLength() - offset, '\n');
FindChar(frag, offset, mContent->TextLength() - offset, '\n');
}
if (contentNewLineOffset < offset + length) {
/*
@ -9348,7 +9349,7 @@ nsTextFrame::TrimOutput nsTextFrame::TrimTrailingWhiteSpace(
uint32_t trimmedStart = start.GetSkippedOffset();
const nsTextFragment* frag = TextFragment();
const nsTextFragment* frag = mContent->GetText();
TrimmedOffsets trimmed = GetTrimmedOffsets(frag);
gfxSkipCharsIterator trimmedEndIter = start;
const nsStyleText* textStyle = StyleText();
@ -9516,7 +9517,7 @@ nsIFrame::RenderedText nsTextFrame::GetRenderedText(
RenderedText result;
nsBlockFrame* lineContainer = nullptr;
nsTextFrame* textFrame;
const nsTextFragment* textFrag = TextFragment();
const nsTextFragment* textFrag = mContent->GetText();
uint32_t offsetInRenderedString = 0;
bool haveOffsets = false;
@ -9692,9 +9693,9 @@ bool nsTextFrame::IsEmpty() {
return true;
}
bool isEmpty =
IsAllWhitespace(TextFragment(), textStyle->mWhiteSpace !=
mozilla::StyleWhiteSpace::PreLine);
bool isEmpty = IsAllWhitespace(
mContent->GetText(),
textStyle->mWhiteSpace != mozilla::StyleWhiteSpace::PreLine);
AddStateBits(isEmpty ? TEXT_IS_ONLY_WHITESPACE : TEXT_ISNOT_ONLY_WHITESPACE);
return isEmpty;
}
@ -9704,7 +9705,7 @@ bool nsTextFrame::IsEmpty() {
void nsTextFrame::ToCString(nsCString& aBuf,
int32_t* aTotalContentLength) const {
// Get the frames text content
const nsTextFragment* frag = TextFragment();
const nsTextFragment* frag = mContent->GetText();
if (!frag) {
return;
}
@ -9885,7 +9886,7 @@ mozilla::JustificationAssignment nsTextFrame::GetJustificationAssignment()
}
uint32_t nsTextFrame::CountGraphemeClusters() const {
const nsTextFragment* frag = TextFragment();
const nsTextFragment* frag = GetContent()->GetText();
MOZ_ASSERT(frag, "Text frame must have text fragment");
nsAutoString content;
frag->AppendTo(content, GetContentOffset(), GetContentLength());
@ -9905,6 +9906,6 @@ bool nsTextFrame::HasNonSuppressedText() {
}
TrimmedOffsets offsets =
GetTrimmedOffsets(TextFragment(), TrimmedOffsetFlags::NoTrimAfter);
GetTrimmedOffsets(mContent->GetText(), TrimmedOffsetFlags::NoTrimAfter);
return offsets.mLength != 0;
}

9
layout/generic/nsTextFrame.h
Просмотреть файл

@ -11,7 +11,7 @@
#include "mozilla/EventForwards.h"
#include "mozilla/gfx/2D.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/dom/Text.h"
#include "mozilla/dom/CharacterData.h"
#include "nsFrame.h"
#include "nsFrameSelection.h"
#include "nsSplittableFrame.h"
@ -157,13 +157,6 @@ class nsTextFrame : public nsFrame {
void ToCString(nsCString& aBuf, int32_t* aTotalContentLength) const;
#endif
// Returns this text frame's content's text fragment.
//
// Assertions in Init() ensure we only ever get a Text node as content.
const nsTextFragment* TextFragment() const {
return &mContent->AsText()->TextFragment();
}
ContentOffsets CalcContentOffsetsFromFramePoint(const nsPoint& aPoint) final;
ContentOffsets GetCharacterOffsetAtFramePoint(const nsPoint& aPoint);

4
layout/generic/nsTextFrameUtils.cpp
Просмотреть файл

@ -340,8 +340,8 @@ template bool nsTextFrameUtils::IsSkippableCharacterForTransformText(
char16_t aChar);
uint32_t nsTextFrameUtils::ComputeApproximateLengthWithWhitespaceCompression(
Text* aText, const nsStyleText* aStyleText) {
const nsTextFragment* frag = &aText->TextFragment();
nsIContent* aContent, const nsStyleText* aStyleText) {
const nsTextFragment* frag = aContent->GetText();
// This is an approximation so we don't really need anything
// too fancy here.
uint32_t len;

8
layout/generic/nsTextFrameUtils.h
Просмотреть файл

@ -13,12 +13,6 @@
class nsIContent;
struct nsStyleText;
namespace mozilla {
namespace dom {
class Text;
}
} // namespace mozilla
#define BIG_TEXT_NODE_SIZE 4096
#define CH_NBSP 160
@ -139,7 +133,7 @@ class nsTextFrameUtils {
}
static uint32_t ComputeApproximateLengthWithWhitespaceCompression(
mozilla::dom::Text* aText, const nsStyleText* aStyleText);
nsIContent* aContent, const nsStyleText* aStyleText);
};
MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(nsTextFrameUtils::Flags)

14
layout/svg/SVGTextFrame.cpp
Просмотреть файл

@ -980,7 +980,7 @@ void TextRenderedRun::GetClipEdges(nscoord& aVisIStartEdge,
// white space, as the nsTextFrame when painting does not include them when
// interpreting clip edges.
nsTextFrame::TrimmedOffsets trimmedOffsets =
mFrame->GetTrimmedOffsets(mFrame->TextFragment());
mFrame->GetTrimmedOffsets(mFrame->GetContent()->GetText());
TrimOffsets(frameOffset, frameLength, trimmedOffsets);
// Convert the trimmed whole-nsTextFrame offset/length into skipped
@ -1885,7 +1885,7 @@ TextRenderedRun TextRenderedRunIterator::Next() {
uint32_t untrimmedOffset = offset;
uint32_t untrimmedLength = length;
nsTextFrame::TrimmedOffsets trimmedOffsets =
frame->GetTrimmedOffsets(frame->TextFragment());
frame->GetTrimmedOffsets(frame->GetContent()->GetText());
TrimOffsets(offset, length, trimmedOffsets);
charIndex += offset - untrimmedOffset;
@ -2364,8 +2364,9 @@ bool CharIterator::IsOriginalCharTrimmed() const {
mFrameForTrimCheck = TextFrame();
uint32_t offset = mFrameForTrimCheck->GetContentOffset();
uint32_t length = mFrameForTrimCheck->GetContentLength();
nsIContent* content = mFrameForTrimCheck->GetContent();
nsTextFrame::TrimmedOffsets trim = mFrameForTrimCheck->GetTrimmedOffsets(
mFrameForTrimCheck->TextFragment(),
content->GetText(),
(mPostReflow ? nsTextFrame::TrimmedOffsetFlags::Default
: nsTextFrame::TrimmedOffsetFlags::NotPostReflow));
TrimOffsets(offset, length, trim);
@ -2381,7 +2382,7 @@ bool CharIterator::IsOriginalCharTrimmed() const {
(index >= mTrimmedOffset + mTrimmedLength &&
mFrameForTrimCheck->StyleText()->NewlineIsSignificant(
mFrameForTrimCheck) &&
mFrameForTrimCheck->TextFragment()->CharAt(index) == '\n'));
mFrameForTrimCheck->GetContent()->GetText()->CharAt(index) == '\n'));
}
void CharIterator::GetOriginalGlyphOffsets(uint32_t& aOriginalOffset,
@ -3803,7 +3804,8 @@ nsresult SVGTextFrame::GetSubStringLength(nsIContent* aContent,
uint32_t trimmedOffset = untrimmedOffset;
uint32_t trimmedLength = untrimmedLength;
nsTextFrame::TrimmedOffsets trimmedOffsets = frame->GetTrimmedOffsets(
frame->TextFragment(), nsTextFrame::TrimmedOffsetFlags::NotPostReflow);
frame->GetContent()->GetText(),
nsTextFrame::TrimmedOffsetFlags::NotPostReflow);
TrimOffsets(trimmedOffset, trimmedLength, trimmedOffsets);
textElementCharIndex += trimmedOffset - untrimmedOffset;
@ -4412,7 +4414,7 @@ void SVGTextFrame::DetermineCharPositions(nsTArray<nsPoint>& aPositions) {
// Any white space characters trimmed at the start of the line of text.
nsTextFrame::TrimmedOffsets trimmedOffsets =
frame->GetTrimmedOffsets(frame->TextFragment());
frame->GetTrimmedOffsets(frame->GetContent()->GetText());
while (it.GetOriginalOffset() < trimmedOffsets.mStart) {
aPositions.AppendElement(position);
it.AdvanceOriginal(1);