Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backout Bug 363089

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@226300 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi
2007-05-11 13:34:12 +00:00
parent 484fa7952d
commit 74bedad7b0
130 changed files with 778 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/layout/forms/nsFileControlFrame.cpp
View File

@@ -63,7 +63,7 @@
#include "nsIFilePicker.h"
#include "nsIDOMMouseEvent.h"
#include "nsINodeInfo.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMEventReceiver.h"
#include "nsILocalFile.h"
#include "nsIFileControlElement.h"
#include "nsNodeInfoManager.h"
@@ -116,13 +116,15 @@ nsFileControlFrame::Destroy()
mTextFrame = nsnull;
// remove mMouseListener as a mouse event listener (bug 40533, bug 355931)
if (mBrowse) {
mBrowse->RemoveEventListenerByIID(mMouseListener,
nsCOMPtr<nsIDOMEventReceiver> receiver(do_QueryInterface(mBrowse));
receiver->RemoveEventListenerByIID(mMouseListener,
NS_GET_IID(nsIDOMMouseListener));
nsContentUtils::DestroyAnonymousContent(&mBrowse);
}
if (mTextContent) {
mTextContent->RemoveEventListenerByIID(mMouseListener,
NS_GET_IID(nsIDOMMouseListener));
nsCOMPtr<nsIDOMEventReceiver> receiver(do_QueryInterface(mTextContent));
receiver->RemoveEventListenerByIID(mMouseListener,
NS_GET_IID(nsIDOMMouseListener));
nsContentUtils::DestroyAnonymousContent(&mTextContent);
}
@@ -169,8 +171,9 @@ nsFileControlFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
return NS_ERROR_OUT_OF_MEMORY;
// register as an event listener of the textbox to open file dialog on mouse click
mTextContent->AddEventListenerByIID(mMouseListener,
NS_GET_IID(nsIDOMMouseListener));
nsCOMPtr<nsIDOMEventReceiver> receiver = do_QueryInterface(mTextContent);
receiver->AddEventListenerByIID(mMouseListener,
NS_GET_IID(nsIDOMMouseListener));
// Create the browse button
NS_NewHTMLElement(getter_AddRefs(mBrowse), nodeInfo);
@@ -195,8 +198,9 @@ nsFileControlFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
return NS_ERROR_OUT_OF_MEMORY;
// register as an event listener of the button to open file dialog on mouse click
mBrowse->AddEventListenerByIID(mMouseListener,
NS_GET_IID(nsIDOMMouseListener));
receiver = do_QueryInterface(mBrowse);
receiver->AddEventListenerByIID(mMouseListener,
NS_GET_IID(nsIDOMMouseListener));
SyncAttr(kNameSpaceID_None, nsGkAtoms::size, SYNC_TEXT);
SyncAttr(kNameSpaceID_None, nsGkAtoms::disabled, SYNC_BOTH);