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

Fixing command dispatcher horkage. r=saari

This commit is contained in:
hyatt%netscape.com 2000-02-09 03:14:03 +00:00
Родитель 575c2d9046
Коммит 8ac3ffd335
2 изменённых файлов: 4 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
content/xul/document/src/nsXULCommandDispatcher.cpp
Просмотреть файл

@ -371,7 +371,7 @@ nsXULCommandDispatcher::Focus(nsIDOMEvent* aEvent)
nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(t); nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(t);
if (domDoc) { if (domDoc) {
GetParentWindowFromDocument(domDoc, getter_AddRefs(domWindow)); GetParentWindowFromDocument(domDoc, getter_AddRefs(domWindow));
if (domWindow && (domWindow != mCurrentWindow)) { if (domWindow) {
SetFocusedWindow(domWindow); SetFocusedWindow(domWindow);
if (mCurrentElement) { if (mCurrentElement) {
// Make sure this element is in our window. If not, we // Make sure this element is in our window. If not, we
@ -380,7 +380,7 @@ nsXULCommandDispatcher::Focus(nsIDOMEvent* aEvent)
mCurrentElement->GetOwnerDocument(getter_AddRefs(ownerDoc)); mCurrentElement->GetOwnerDocument(getter_AddRefs(ownerDoc));
nsCOMPtr<nsIDOMDocument> windowDoc; nsCOMPtr<nsIDOMDocument> windowDoc;
mCurrentWindow->GetDocument(getter_AddRefs(windowDoc)); mCurrentWindow->GetDocument(getter_AddRefs(windowDoc));
if (ownerDoc == windowDoc) if (ownerDoc != windowDoc)
mCurrentElement = nsnull; mCurrentElement = nsnull;
} }

4
rdf/content/src/nsXULCommandDispatcher.cpp
Просмотреть файл

@ -371,7 +371,7 @@ nsXULCommandDispatcher::Focus(nsIDOMEvent* aEvent)
nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(t); nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(t);
if (domDoc) { if (domDoc) {
GetParentWindowFromDocument(domDoc, getter_AddRefs(domWindow)); GetParentWindowFromDocument(domDoc, getter_AddRefs(domWindow));
if (domWindow && (domWindow != mCurrentWindow)) { if (domWindow) {
SetFocusedWindow(domWindow); SetFocusedWindow(domWindow);
if (mCurrentElement) { if (mCurrentElement) {
// Make sure this element is in our window. If not, we // Make sure this element is in our window. If not, we
@ -380,7 +380,7 @@ nsXULCommandDispatcher::Focus(nsIDOMEvent* aEvent)
mCurrentElement->GetOwnerDocument(getter_AddRefs(ownerDoc)); mCurrentElement->GetOwnerDocument(getter_AddRefs(ownerDoc));
nsCOMPtr<nsIDOMDocument> windowDoc; nsCOMPtr<nsIDOMDocument> windowDoc;
mCurrentWindow->GetDocument(getter_AddRefs(windowDoc)); mCurrentWindow->GetDocument(getter_AddRefs(windowDoc));
if (ownerDoc == windowDoc) if (ownerDoc != windowDoc)
mCurrentElement = nsnull; mCurrentElement = nsnull;
} }