Backout Bug 677026

This commit is contained in:
Olli Pettay 2011-08-07 01:10:07 +03:00
parent 5fa9339250
commit 261aec5624
4 changed files with 5 additions and 6 deletions

View File

@ -6233,7 +6233,8 @@ nsDocument::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
// Load events must not propagate to |window| object, see bug 335251.
if (aVisitor.mEvent->message != NS_LOAD) {
aVisitor.mParentTarget = GetWindow();
nsGlobalWindow* window = static_cast<nsGlobalWindow*>(GetWindow());
aVisitor.mParentTarget = static_cast<nsIDOMEventTarget*>(window);
}
return NS_OK;
}

View File

@ -272,6 +272,7 @@ class nsGlobalWindow : public nsPIDOMWindow,
public nsIScriptGlobalObject,
public nsIDOMJSWindow,
public nsIScriptObjectPrincipal,
public nsIDOMEventTarget,
public nsIDOMStorageIndexedDB,
public nsSupportsWeakReference,
public nsIInterfaceRequestor,

View File

@ -91,5 +91,3 @@ XPIDLSRCS = \
$(NULL)
include $(topsrcdir)/config/rules.mk
XPIDL_FLAGS += -I$(topsrcdir)/dom/interfaces/events

View File

@ -40,7 +40,6 @@
* ***** END LICENSE BLOCK ***** */
#include "domstubs.idl"
#include "nsIDOMEventTarget.idl"
%{ C++
#include "jspubtd.h"
@ -75,8 +74,8 @@ interface nsIDOMMozURLProperty : nsISupports
* @see <http://www.whatwg.org/html/#window>
*/
[scriptable, builtinclass, uuid(74a4e350-0869-4e81-9e6c-83a981fd5f6c)]
interface nsIDOMWindow : nsIDOMEventTarget
[scriptable, uuid(972cb379-6bdc-4544-8b46-8d721e12e906)]
interface nsIDOMWindow : nsISupports
{
// the current browsing context
readonly attribute nsIDOMWindow window;