diff --git a/mozilla/dom/src/base/nsDOMClassInfo.cpp b/mozilla/dom/src/base/nsDOMClassInfo.cpp index 6af89dbd110..d0873d4eb67 100644 --- a/mozilla/dom/src/base/nsDOMClassInfo.cpp +++ b/mozilla/dom/src/base/nsDOMClassInfo.cpp @@ -4495,10 +4495,14 @@ nsWindowSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, const char *name = JS_GET_CLASS(cx, JSVAL_TO_OBJECT(*vp))->name; // The list of Window class names here need to be kept in sync - // with the actual class names! + // with the actual class names! The class name + // XPCCrossOriginWrapper needs to be handled here too as XOWs + // define child frame names with a XOW as the value, and thus + // we'll need to get through here with XOWs class name too. if ((*name == 'W' && strcmp(name, "Window") == 0) || (*name == 'C' && strcmp(name, "ChromeWindow") == 0) || - (*name == 'M' && strcmp(name, "ModalContentWindow") == 0)) { + (*name == 'M' && strcmp(name, "ModalContentWindow") == 0) || + (*name == 'X' && strcmp(name, "XPCCrossOriginWrapper") == 0)) { nsCOMPtr vpwrapper; sXPConnect->GetWrappedNativeOfJSObject(cx, JSVAL_TO_OBJECT(*vp), getter_AddRefs(vpwrapper)); diff --git a/mozilla/dom/tests/mochitest/bugs/Makefile.in b/mozilla/dom/tests/mochitest/bugs/Makefile.in index 7fa42a52737..6be268e47f5 100644 --- a/mozilla/dom/tests/mochitest/bugs/Makefile.in +++ b/mozilla/dom/tests/mochitest/bugs/Makefile.in @@ -77,6 +77,8 @@ _TEST_FILES = \ test_bug430276.html \ iframe_bug430276.html \ iframe_bug430276-2.html \ + test_bug440572.html \ + iframe_bug440572.html \ $(NULL) libs:: $(_TEST_FILES) diff --git a/mozilla/dom/tests/mochitest/bugs/iframe_bug440572.html b/mozilla/dom/tests/mochitest/bugs/iframe_bug440572.html new file mode 100644 index 00000000000..db8880045a7 --- /dev/null +++ b/mozilla/dom/tests/mochitest/bugs/iframe_bug440572.html @@ -0,0 +1,17 @@ + + + +

Move on, nothing to see here...

+ + diff --git a/mozilla/dom/tests/mochitest/bugs/test_bug440572.html b/mozilla/dom/tests/mochitest/bugs/test_bug440572.html new file mode 100644 index 00000000000..8645d427fac --- /dev/null +++ b/mozilla/dom/tests/mochitest/bugs/test_bug440572.html @@ -0,0 +1,48 @@ + + + + + Test for Bug 440572 + + + + + +Mozilla Bug 440572 + + +
+ +
+ +
+ + + +