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 847983 - Skip script text nodes for content events; r=masayuki

Browse Source
This commit is contained in:
Jim Chen 2013-04-03 20:46:06 -04:00
parent af03a1e9c3
commit ee94e60acd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/events/src/nsContentEventHandler.cpp
View File

@ -230,6 +230,10 @@ static uint32_t CountNewlinesInNativeLength(nsIContent* aContent,
nsContentEventHandler::GetNativeTextLength(nsIContent* aContent, uint32_t aMaxLength) nsContentEventHandler::GetNativeTextLength(nsIContent* aContent, uint32_t aMaxLength)
{ {
if (aContent->IsNodeOfType(nsINode::eTEXT)) { if (aContent->IsNodeOfType(nsINode::eTEXT)) {
// Skip text nodes without frames, e.g. inside script elements
if (!aContent->GetPrimaryFrame()) {
return 0;
}
uint32_t textLengthDifference = uint32_t textLengthDifference =
#if defined(XP_MACOSX) #if defined(XP_MACOSX)
// On Mac, the length of a native newline ("\r") is equal to the length of // On Mac, the length of a native newline ("\r") is equal to the length of
@ -309,6 +313,10 @@ static nsresult GenerateFlatTextContent(nsRange* aRange,
nsIContent* content = static_cast<nsIContent*>(node); nsIContent* content = static_cast<nsIContent*>(node);
if (content->IsNodeOfType(nsINode::eTEXT)) { if (content->IsNodeOfType(nsINode::eTEXT)) {
// Skip text nodes without frames, e.g. inside script elements
if (!content->GetPrimaryFrame()) {
continue;
}
if (content == startNode) if (content == startNode)
AppendSubString(aString, content, aRange->StartOffset(), AppendSubString(aString, content, aRange->StartOffset(),
content->TextLength() - aRange->StartOffset()); content->TextLength() - aRange->StartOffset());