Backing out 410eb23d33c7 to restore accidentaly deleted file (parser/html/javasrc/README.txt).
authorPeter Van der Beken <peterv@propagandism.org>
Thu, 13 Aug 2009 10:02:48 +0200
changeset 31425 6d21a1f546736499561b105d8d7cdfbb1e2eb4bc
parent 31424 bc03cb3fd8ba3593ed031f526f950e4eca89775f
child 31426 a5105991af66ac9deb2066ced70d5aece3c2da48
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
milestone1.9.2a2pre
Backing out 410eb23d33c7 to restore accidentaly deleted file (parser/html/javasrc/README.txt).
dom/base/nsDOMClassInfo.cpp
parser/html/javasrc/README.txt
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -5877,33 +5877,16 @@ nsWindowSH::GlobalResolve(nsGlobalWindow
   if (name_struct->mType == nsGlobalNameStruct::eTypeClassConstructor ||
       name_struct->mType == nsGlobalNameStruct::eTypeExternalClassInfo) {
     // Create the XPConnect prototype for our classinfo, PostCreateProto will
     // set up the prototype chain.
     nsCOMPtr<nsIXPConnectJSObjectHolder> proto_holder;
     rv = GetXPCProto(sXPConnect, cx, aWin, name_struct,
                      getter_AddRefs(proto_holder));
 
-    if (NS_SUCCEEDED(rv) && obj != aWin->GetGlobalJSObject()) {
-      JSObject* dot_prototype;
-      rv = proto_holder->GetJSObject(&dot_prototype);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      const nsDOMClassInfoData *ci_data;
-      if (name_struct->mType == nsGlobalNameStruct::eTypeClassConstructor) {
-        ci_data = &sClassInfoData[name_struct->mDOMClassInfoID];
-      } else {
-        ci_data = name_struct->mData;
-      }
-
-      return ResolvePrototype(sXPConnect, aWin, cx, obj, class_name, ci_data,
-                              name_struct, nameSpaceManager, dot_prototype,
-                              PR_TRUE, did_resolve);
-    }
-
     *did_resolve = NS_SUCCEEDED(rv);
 
     return rv;
   }
 
   if (name_struct->mType == nsGlobalNameStruct::eTypeClassProto) {
     // We don't have a XPConnect prototype object, let ResolvePrototype create
     // one.
new file mode 100644
--- /dev/null
+++ b/parser/html/javasrc/README.txt
@@ -0,0 +1,6 @@
+The .java files in this directory were placed here by the Java-to-C++
+translator that lives in parser/html/java/translator.  Together they represent
+a snapshot of the Java code that was translated to produce the corresponding
+.h and .cpp files in the parent directory.  Changing these .java files is not
+worthwhile, as they will just be overwritten by the next translation.  See
+parser/html/java/README.txt for information about performing the translation.