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

disabling fix for 46554 again, in order to fix smoketest blocker 50653 et al

This commit is contained in:
jfrancis%netscape.com 2000-08-29 19:55:16 +00:00
Родитель 0bee60c556
Коммит 299877ed6d
3 изменённых файлов: 12 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
content/base/src/nsSelection.cpp
Просмотреть файл

@ -5240,6 +5240,7 @@ nsDOMSelection::ContainsNode(nsIDOMNode* aNode, PRBool aRecursive, PRBool* aYes)
if (!range)
return NS_ERROR_UNEXPECTED;
#if 0
// For bug 46554: since the only callers of ContainsNode() is the copy code from document,
// I'm altering the semantics of this routine. Now it will consider any node whose
// children are all selected to be selected itself. This is to help the user get
@ -5252,11 +5253,12 @@ nsDOMSelection::ContainsNode(nsIDOMNode* aNode, PRBool aRecursive, PRBool* aYes)
rv = PromoteRange(newrange);
if (NS_FAILED(rv)) return rv;
#endif
nsCOMPtr<nsIContent> content (do_QueryInterface(aNode));
if (content)
{
if (IsNodeIntersectsRange(content, newrange))
if (IsNodeIntersectsRange(content, range))
{
// If recursive, then we're done -- IsNodeIntersectsRange does the right thing
if (aRecursive)
@ -5268,7 +5270,7 @@ nsDOMSelection::ContainsNode(nsIDOMNode* aNode, PRBool aRecursive, PRBool* aYes)
// else not recursive -- node itself must be contained,
// so we need to do more checking
PRBool nodeStartsBeforeRange, nodeEndsAfterRange;
if (NS_SUCCEEDED(CompareNodeToRange(content, newrange,
if (NS_SUCCEEDED(CompareNodeToRange(content, range,
&nodeStartsBeforeRange,
&nodeEndsAfterRange)))
{

6
layout/base/src/nsSelection.cpp
Просмотреть файл

@ -5240,6 +5240,7 @@ nsDOMSelection::ContainsNode(nsIDOMNode* aNode, PRBool aRecursive, PRBool* aYes)
if (!range)
return NS_ERROR_UNEXPECTED;
#if 0
// For bug 46554: since the only callers of ContainsNode() is the copy code from document,
// I'm altering the semantics of this routine. Now it will consider any node whose
// children are all selected to be selected itself. This is to help the user get
@ -5252,11 +5253,12 @@ nsDOMSelection::ContainsNode(nsIDOMNode* aNode, PRBool aRecursive, PRBool* aYes)
rv = PromoteRange(newrange);
if (NS_FAILED(rv)) return rv;
#endif
nsCOMPtr<nsIContent> content (do_QueryInterface(aNode));
if (content)
{
if (IsNodeIntersectsRange(content, newrange))
if (IsNodeIntersectsRange(content, range))
{
// If recursive, then we're done -- IsNodeIntersectsRange does the right thing
if (aRecursive)
@ -5268,7 +5270,7 @@ nsDOMSelection::ContainsNode(nsIDOMNode* aNode, PRBool aRecursive, PRBool* aYes)
// else not recursive -- node itself must be contained,
// so we need to do more checking
PRBool nodeStartsBeforeRange, nodeEndsAfterRange;
if (NS_SUCCEEDED(CompareNodeToRange(content, newrange,
if (NS_SUCCEEDED(CompareNodeToRange(content, range,
&nodeStartsBeforeRange,
&nodeEndsAfterRange)))
{

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

@ -5240,6 +5240,7 @@ nsDOMSelection::ContainsNode(nsIDOMNode* aNode, PRBool aRecursive, PRBool* aYes)
if (!range)
return NS_ERROR_UNEXPECTED;
#if 0
// For bug 46554: since the only callers of ContainsNode() is the copy code from document,
// I'm altering the semantics of this routine. Now it will consider any node whose
// children are all selected to be selected itself. This is to help the user get
@ -5252,11 +5253,12 @@ nsDOMSelection::ContainsNode(nsIDOMNode* aNode, PRBool aRecursive, PRBool* aYes)
rv = PromoteRange(newrange);
if (NS_FAILED(rv)) return rv;
#endif
nsCOMPtr<nsIContent> content (do_QueryInterface(aNode));
if (content)
{
if (IsNodeIntersectsRange(content, newrange))
if (IsNodeIntersectsRange(content, range))
{
// If recursive, then we're done -- IsNodeIntersectsRange does the right thing
if (aRecursive)
@ -5268,7 +5270,7 @@ nsDOMSelection::ContainsNode(nsIDOMNode* aNode, PRBool aRecursive, PRBool* aYes)
// else not recursive -- node itself must be contained,
// so we need to do more checking
PRBool nodeStartsBeforeRange, nodeEndsAfterRange;
if (NS_SUCCEEDED(CompareNodeToRange(content, newrange,
if (NS_SUCCEEDED(CompareNodeToRange(content, range,
&nodeStartsBeforeRange,
&nodeEndsAfterRange)))
{