[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 67a17d62d615f3988ff47aefb03daff99ecb3820
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 22 15:39:58 2004 +0000

            * khtml/ecma/kjs_window.cpp: (Window::get): Removed code that gets properties from the parent.
            This was a mistake we inherited from KHTML, and they have long since fixed it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 39b685a..f8b213a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2004-04-22  Darin Adler  <darin at apple.com>
+
+        * khtml/ecma/kjs_window.cpp: (Window::get): Removed code that gets properties from the parent.
+        This was a mistake we inherited from KHTML, and they have long since fixed it.
+
 2004-04-22  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index ca3c1e3..7036015 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -761,22 +761,6 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     }
   }
 
-  // give access to functions (and variables ?) from parent frameset
-  if (m_part->parentPart())
-  {
-    Object parentObject = Object::dynamicCast( retrieve(m_part->parentPart()) );
-    if ( !parentObject.isNull() )
-    {
-      Value ret = parentObject.get(exec,p);
-      if (ret.type() != UndefinedType ) {
-#ifdef KJS_VERBOSE
-        kdDebug(6070) << "Window::get property " << p.qstring() << " found in parent part" << endl;
-#endif
-        return ret;
-      }
-    }
-  }
-
   // This isn't necessarily a bug. Some code uses if(!window.blah) window.blah=1
   // But it can also mean something isn't loaded or implemented, hence the WARNING to help grepping.
 #ifdef KJS_VERBOSE

-- 
WebKit Debian packaging