[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 5b2cd14f11667c7d41aeaa9110fb0bc0675ab09e
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 21:18:54 2010 +0000

            More build fixing (for what is actually a 64-bit failure, as 32-bit apparently includes
            headers that aren't included in 64-bit).
    
            * Plugins/Hosted/NetscapePluginInstanceProxy.h:
            * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
            (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::contains):
            (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::get):
            Move inline functions to .cpp; also made the class Noncopyable.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54791 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index d32dbe7..e786e36 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,16 @@
 2010-02-15  Alexey Proskuryakov  <ap at apple.com>
 
+        More build fixing (for what is actually a 64-bit failure, as 32-bit apparently includes
+        headers that aren't included in 64-bit).
+
+        * Plugins/Hosted/NetscapePluginInstanceProxy.h:
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::contains):
+        (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::get):
+        Move inline functions to .cpp; also made the class Noncopyable.
+
+2010-02-15  Alexey Proskuryakov  <ap at apple.com>
+
         Mac release build fix attempt.
 
         * Plugins/Hosted/NetscapePluginInstanceProxy.h:
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
index 78025e6..29a5a2d 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
@@ -310,7 +310,7 @@ private:
     bool demarshalValueFromArray(JSC::ExecState*, NSArray *array, NSUInteger& index, JSC::JSValue& result);
     void demarshalValues(JSC::ExecState*, data_t valuesData, mach_msg_type_number_t valuesLength, JSC::MarkedArgumentBuffer& result);
 
-    class LocalObjectMap {
+    class LocalObjectMap : Noncopyable {
     public:
         LocalObjectMap();
         ~LocalObjectMap();
@@ -319,8 +319,8 @@ private:
         void release(JSC::JSObject*);
         void clear();
         bool forget(uint32_t);
-        bool contains(uint32_t objectID) const { return m_idToJSObjectMap.contains(objectID); }
-        JSC::JSObject* get(uint32_t objectID) const { return m_idToJSObjectMap.get(objectID); }
+        bool contains(uint32_t) const;
+        JSC::JSObject* get(uint32_t) const;
 
     private:
         HashMap<uint32_t, JSC::ProtectedPtr<JSC::JSObject> > m_idToJSObjectMap;
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
index 7cc71bb..d11f25c 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
@@ -109,6 +109,16 @@ NetscapePluginInstanceProxy::LocalObjectMap::~LocalObjectMap()
 {
 }
 
+inline bool NetscapePluginInstanceProxy::LocalObjectMap::contains(uint32_t objectID) const
+{
+    return m_idToJSObjectMap.contains(objectID);
+}
+
+inline JSC::JSObject* NetscapePluginInstanceProxy::LocalObjectMap::get(uint32_t objectID) const
+{
+    return m_idToJSObjectMap.get(objectID);
+}
+
 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