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

Bug 1394758 - Part 1. non-editable text node should be treated as WSType::special, not WSType::text. r=masayuki

Browse Source 
This bug occurs that WSRunObject::PrepareToDeleteRangePriv() calls WSRunObject::ConvertToNBSP for non-editable text node.

Actually, even if text node isn't editable, WSFragment::mType becomes WSType::text now.  So, whitespace only node at the end of contenteditable=false is treated as WSType::normalWS, i.e., treated as editable.

So text node in contenteditable=false should treated as WSType::special which means a non-editable inline object.   Then, WSRunObject won't create object chunk of WSType::normalWS for text node in contenteditable=false.

MozReview-Commit-ID: GOjxax8KvDD

--HG--
extra : rebase_source : e5fff30a2710c2021d59ce88bf2698ce4ebe2dfc
This commit is contained in:
Makoto Kato 2017-09-11 15:52:05 +09:00
parent 4cd174edb5
commit bf93a68c34
3 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/libeditor/WSRunObject.cpp
View File

@ -643,7 +643,9 @@ WSRunObject::GetWSNodes()
mStartOffset = start.offset;
mStartReason = WSType::otherBlock;
mStartReasonNode = priorNode;
} else if (RefPtr<Text> textNode = priorNode->GetAsText()) {
} else if (priorNode->IsNodeOfType(nsINode::eTEXT) &&
priorNode->IsEditable()) {
RefPtr<Text> textNode = priorNode->GetAsText();
mNodeArray.InsertElementAt(0, textNode);
const nsTextFragment *textFrag;
if (!textNode || !(textFrag = textNode->GetText())) {
@ -750,7 +752,9 @@ WSRunObject::GetWSNodes()
mEndOffset = end.offset;
mEndReason = WSType::otherBlock;
mEndReasonNode = nextNode;
} else if (RefPtr<Text> textNode = nextNode->GetAsText()) {
} else if (nextNode->IsNodeOfType(nsINode::eTEXT) &&
nextNode->IsEditable()) {
RefPtr<Text> textNode = nextNode->GetAsText();
mNodeArray.AppendElement(textNode);
const nsTextFragment *textFrag;
if (!textNode || !(textFrag = textNode->GetText())) {

1
editor/libeditor/tests/mochitest.ini
View File

@ -252,6 +252,7 @@ skip-if = toolkit == 'android' # bug 1315898
[test_bug1361008.html]
[test_bug1368544.html]
[test_bug1385905.html]
[test_bug1394758.html]
[test_CF_HTML_clipboard.html]
subsuite = clipboard

60
editor/libeditor/tests/test_bug1394758.html Normal file
View File

@ -0,0 +1,60 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1394758
-->
<head>
<title>Test for Bug1394758</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1394758">Mozilla Bug 1394758</a>
<p id="display"></p>
<div id="content">
<div id="editable" contenteditable="true">
<span id="span" contenteditable="false">
Hello
</span>
World
</div>
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 611182 **/
SimpleTest.waitForExplicitFinish();
SimpleTest.waitForFocus(function() {
var editable = document.getElementById('editable');
var span = document.getElementById('span');
var beforeSpan = span.textContent;
editable.focus();
window.getSelection().collapse(span.nextSibling, 0);
synthesizeKey("KEY_ArrowRight", {});
synthesizeKey("KEY_ArrowRight", {});
synthesizeKey("KEY_ArrowRight", {});
synthesizeKey("KEY_Backspace", {});
synthesizeKey("KEY_Backspace", {});
is(span.textContent, beforeSpan,
"VK_BACK_SPACE should not modify non-editable area");
is(span.nextSibling.textContent.trim(), "rld",
"VK_BACK_SPACE should delete first 2 characters");
synthesizeKey("KEY_Delete", {});
is(span.textContent, beforeSpan,
"VK_DELETE should not modify non-editable area");
is(span.nextSibling.textContent.trim(), "ld",
"VK_DELETE should delete first character");
SimpleTest.finish();
});
</script>
</pre>
</body>
</html>