[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 13:18:43 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 345dd260f2a28af0d969221efd90c5e33bdffe49
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 22:08:41 2010 +0000

    2010-09-10  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Remove mention of "part" from Document.cpp
            https://bugs.webkit.org/show_bug.cgi?id=45566
    
            This is an old KHTML name that's lingering around.
    
            * dom/Document.cpp:
            (WebCore::Document::parentDocument):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67239 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9ba7236..13996f1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Remove mention of "part" from Document.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=45566
+
+        This is an old KHTML name that's lingering around.
+
+        * dom/Document.cpp:
+        (WebCore::Document::parentDocument):
+
 2010-09-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index b04a209..9ba489d 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -3978,10 +3978,9 @@ bool Document::inDesignMode() const
 
 Document* Document::parentDocument() const
 {
-    Frame* childPart = frame();
-    if (!childPart)
+    if (!m_frame)
         return 0;
-    Frame* parent = childPart->tree()->parent();
+    Frame* parent = m_frame->tree()->parent();
     if (!parent)
         return 0;
     return parent->document();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list