Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 02:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 406671. Speed up nsWindowSH::GetProperty(). r+sr=peterv@propagandism.org, a=jonas@sicking.cc

Browse Source
This commit is contained in:
jst@mozilla.org 2007-12-03 19:53:00 -08:00
parent d91b8ab657
commit e1961ddec2
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/src/base/nsDOMClassInfo.cpp
View File

@ -4466,19 +4466,31 @@ nsWindowSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
// child frame in nsWindowSH::NewResolve() (*vp will tell us if // child frame in nsWindowSH::NewResolve() (*vp will tell us if
// that's the case). If *vp is a window object (i.e. a child // that's the case). If *vp is a window object (i.e. a child
// frame), return without doing a security check. // frame), return without doing a security check.
//
// Calling GetWrappedNativeOfJSObject() is not all that cheap, so
// only do that if the JSClass name is one that is likely to be a
// window object.
nsCOMPtr<nsIXPConnectWrappedNative> vpwrapper; const char *name = JS_GET_CLASS(cx, JSVAL_TO_OBJECT(*vp))->name;
sXPConnect->GetWrappedNativeOfJSObject(cx, JSVAL_TO_OBJECT(*vp),
getter_AddRefs(vpwrapper));
if (vpwrapper) { // The list of Window class names here need to be kept in sync
nsCOMPtr<nsIDOMWindow> window(do_QueryWrappedNative(vpwrapper)); // with the actual class names!
if ((*name == 'W' && strcmp(name, "Window") == 0) ||
(*name == 'C' && strcmp(name, "ChromeWindow") == 0) ||
(*name == 'M' && strcmp(name, "ModalContentWindow") == 0)) {
nsCOMPtr<nsIXPConnectWrappedNative> vpwrapper;
sXPConnect->GetWrappedNativeOfJSObject(cx, JSVAL_TO_OBJECT(*vp),
getter_AddRefs(vpwrapper));
if (window) { if (vpwrapper) {
// Yup, *vp is a window object, return early (*vp is already nsCOMPtr<nsIDOMWindow> window(do_QueryWrappedNative(vpwrapper));
// the window, so no need to wrap it again).
return NS_SUCCESS_I_DID_SOMETHING; if (window) {
// Yup, *vp is a window object, return early (*vp is already
// the window, so no need to wrap it again).
return NS_SUCCESS_I_DID_SOMETHING;
}
} }
} }
} }