[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 873fd439b846222c30088e4a2267e3630200c1da
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 11 18:41:16 2003 +0000

            Reviewed by Dave.
    
            - added a function Dave needs for various work he's doing that goes
              from a document to the corresponding element in the parent document
    
            * khtml/xml/dom_docimpl.h: Add ownerElement member function.
            * khtml/xml/dom_docimpl.cpp: (DocumentImpl::ownerElement):
            Added. Gets to the parent part and finds the right element.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4627 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 943ba42..1cc3d1c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-07-11  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - added a function Dave needs for various work he's doing that goes
+          from a document to the corresponding element in the parent document
+
+        * khtml/xml/dom_docimpl.h: Add ownerElement member function.
+        * khtml/xml/dom_docimpl.cpp: (DocumentImpl::ownerElement):
+        Added. Gets to the parent part and finds the right element.
+
 2003-07-11  Dave Hyatt  <hyatt at apple.com>
 
 	An initial implementation of the CSS opacity property.  Seems
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 943ba42..1cc3d1c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-07-11  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - added a function Dave needs for various work he's doing that goes
+          from a document to the corresponding element in the parent document
+
+        * khtml/xml/dom_docimpl.h: Add ownerElement member function.
+        * khtml/xml/dom_docimpl.cpp: (DocumentImpl::ownerElement):
+        Added. Gets to the parent part and finds the right element.
+
 2003-07-11  Dave Hyatt  <hyatt at apple.com>
 
 	An initial implementation of the CSS opacity property.  Seems
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 527c759..72ecbd2 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -44,7 +44,7 @@
 #include <kstaticdeleter.h>
 
 #include "rendering/render_canvas.h"
-#include "rendering/render_replaced.h"
+#include "rendering/render_frames.h"
 #include "rendering/render_image.h"
 #include "render_arena.h"
 
@@ -2286,6 +2286,26 @@ void DocumentImpl::removeCheckedRadioButton(HTMLInputElementImpl *b)
     m_checkedRadioButtons.remove(name);
 }
 
+ElementImpl *DocumentImpl::ownerElement()
+{
+    KHTMLView *childView = view();
+    if (!childView)
+        return 0;
+    KHTMLPart *childPart = childView->part();
+    if (!childPart)
+        return 0;
+    KHTMLPart *parent = childPart->parentPart();
+    if (!parent)
+        return 0;
+    ChildFrame *childFrame = parent->frame(childPart);
+    if (!childFrame)
+        return 0;
+    RenderPart *renderPart = childFrame->m_frame;
+    if (!renderPart)
+        return 0;
+    return static_cast<ElementImpl *>(renderPart->element());
+}
+
 #if APPLE_CHANGES
 
 void DocumentImpl::setDecoder(Decoder *decoder)
diff --git a/WebCore/khtml/xml/dom_docimpl.h b/WebCore/khtml/xml/dom_docimpl.h
index d4913cd..85ef49f 100644
--- a/WebCore/khtml/xml/dom_docimpl.h
+++ b/WebCore/khtml/xml/dom_docimpl.h
@@ -438,6 +438,10 @@ public:
     
     void addCheckedRadioButton(HTMLInputElementImpl *);
     void removeCheckedRadioButton(HTMLInputElementImpl *);
+    
+    // Returns the owning element in the parent document.
+    // Returns 0 if this is the top level document.
+    ElementImpl *ownerElement();
 
 signals:
     void finishedParsing();

-- 
WebKit Debian packaging