[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit e5cb28e44a6b45323cd7db5c94a2e5485dc9de06
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 05:28:33 2009 +0000

    2009-12-03  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            The code should say that Document owns DocLoader
            https://bugs.webkit.org/show_bug.cgi?id=32143
    
            It's the truth.
    
            * dom/Document.cpp:
            (WebCore::Document::~Document):
            * dom/Document.h:
            (WebCore::Document::docLoader):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51676 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b88bae0..c9df8d9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-03  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        The code should say that Document owns DocLoader
+        https://bugs.webkit.org/show_bug.cgi?id=32143
+
+        It's the truth.
+
+        * dom/Document.cpp:
+        (WebCore::Document::~Document):
+        * dom/Document.h:
+        (WebCore::Document::docLoader):
+
 2009-12-03  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 923efa2..8d2990e 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -485,8 +485,8 @@ Document::~Document()
     delete m_tokenizer;
     m_document = 0;
     delete m_styleSelector;
-    delete m_docLoader;
-    
+    m_docLoader.clear();
+
     if (m_renderArena) {
         delete m_renderArena;
         m_renderArena = 0;
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 54c563b..34c735b 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -453,7 +453,7 @@ public:
     void updateLayout();
     void updateLayoutIgnorePendingStylesheets();
     static void updateStyleForAllDocuments(); // FIXME: Try to reduce the # of calls to this function.
-    DocLoader* docLoader() { return m_docLoader; }
+    DocLoader* docLoader() { return m_docLoader.get(); }
 
     virtual void attach();
     virtual void detach();
@@ -960,7 +960,7 @@ private:
     bool m_didCalculateStyleSelector;
 
     Frame* m_frame;
-    DocLoader* m_docLoader;
+    OwnPtr<DocLoader> m_docLoader;
     Tokenizer* m_tokenizer;
     bool m_wellFormed;
 

-- 
WebKit Debian packaging