[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9bb731b2828e07108e76235db6d6803e5c8eef3a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 06:19:58 2009 +0000

    2009-12-03  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            OwnPtr<XBLBindingManager> Document::m_bindingManager;
            https://bugs.webkit.org/show_bug.cgi?id=32147
    
            The document actually owns the bindingManager.  That's what the code
            should say.
    
            * dom/Document.cpp:
            (WebCore::Document::~Document):
            * dom/Document.h:
            (WebCore::Document::bindingManager):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51680 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ee92363..2b3587e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by Eric Seidel.
 
+        OwnPtr<XBLBindingManager> Document::m_bindingManager;
+        https://bugs.webkit.org/show_bug.cgi?id=32147
+
+        The document actually owns the bindingManager.  That's what the code
+        should say.
+
+        * dom/Document.cpp:
+        (WebCore::Document::~Document):
+        * dom/Document.h:
+        (WebCore::Document::bindingManager):
+
+2009-12-03  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         OwnPtr<Tokenizer> Document::m_tokenizer;
         https://bugs.webkit.org/show_bug.cgi?id=32145
 
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index d9f0503..f9dc97f 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -487,7 +487,7 @@ Document::~Document()
     m_renderArena.clear();
 
 #if ENABLE(XBL)
-    delete m_bindingManager;
+    m_bindingManager.clear();
 #endif
 
     deleteAllValues(m_markers);
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index aa3c37e..37dafc9 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -766,7 +766,7 @@ public:
 
 #if ENABLE(XBL)
     // XBL methods
-    XBLBindingManager* bindingManager() const { return m_bindingManager; }
+    XBLBindingManager* bindingManager() const { return m_bindingManager.get(); }
 #endif
 
     void incDOMTreeVersion() { ++m_domtree_version; }
@@ -1088,7 +1088,7 @@ private:
 #endif
 
 #if ENABLE(XBL)
-    XBLBindingManager* m_bindingManager; // The access point through which documents and elements communicate with XBL.
+    OwnPtr<XBLBindingManager> m_bindingManager; // The access point through which documents and elements communicate with XBL.
 #endif
     
     typedef HashMap<AtomicStringImpl*, HTMLMapElement*> ImageMapsByName;

-- 
WebKit Debian packaging