[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[ap at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit c5c01322f97f5b6c48ad806c30059e58693ff528
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 20:42:10 2010 +0000

            Mac release build fix attempt.
    
            * Plugins/Hosted/NetscapePluginInstanceProxy.h:
            * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
            (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::~LocalObjectMap):
            Implement destructor in .cpp file, where necessary headers are already included.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54787 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 41fbcc5..d32dbe7 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-15  Alexey Proskuryakov  <ap at apple.com>
+
+        Mac release build fix attempt.
+
+        * Plugins/Hosted/NetscapePluginInstanceProxy.h:
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::~LocalObjectMap):
+        Implement destructor in .cpp file, where necessary headers are already included.
+
 2010-02-12  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Kevin Decker.
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
index b782d42..78025e6 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
@@ -313,6 +313,7 @@ private:
     class LocalObjectMap {
     public:
         LocalObjectMap();
+        ~LocalObjectMap();
         uint32_t idForObject(JSC::JSObject*);
         void retain(JSC::JSObject*);
         void release(JSC::JSObject*);
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
index 4354cb6..7cc71bb 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
@@ -105,6 +105,10 @@ NetscapePluginInstanceProxy::LocalObjectMap::LocalObjectMap()
 {
 }
 
+NetscapePluginInstanceProxy::LocalObjectMap::~LocalObjectMap()
+{
+}
+
 uint32_t NetscapePluginInstanceProxy::LocalObjectMap::idForObject(JSObject* object)
 {
     // This method creates objects with refcount of 1, but doesn't increase refcount when returning

-- 
WebKit Debian packaging