Title: [154709] trunk/Source/WebKit/mac
Revision
154709
Author
[email protected]
Date
2013-08-27 14:38:12 -0700 (Tue, 27 Aug 2013)

Log Message

Fix build.

* Plugins/Hosted/ProxyInstance.h:
* Plugins/Hosted/ProxyInstance.mm:
(WebKit::ProxyInstance::methodNamed):
(WebKit::ProxyInstance::fieldNamed):

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (154708 => 154709)


--- trunk/Source/WebKit/mac/ChangeLog	2013-08-27 21:26:58 UTC (rev 154708)
+++ trunk/Source/WebKit/mac/ChangeLog	2013-08-27 21:38:12 UTC (rev 154709)
@@ -1,3 +1,12 @@
+2013-08-27  Anders Carlsson  <[email protected]>
+
+        Fix build.
+
+        * Plugins/Hosted/ProxyInstance.h:
+        * Plugins/Hosted/ProxyInstance.mm:
+        (WebKit::ProxyInstance::methodNamed):
+        (WebKit::ProxyInstance::fieldNamed):
+
 2013-08-23  Andy Estes  <[email protected]>
 
         Fix issues found by the Clang Static Analyzer

Modified: trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h (154708 => 154709)


--- trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h	2013-08-27 21:26:58 UTC (rev 154708)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h	2013-08-27 21:38:12 UTC (rev 154709)
@@ -99,8 +99,8 @@
 
     NetscapePluginInstanceProxy* m_instanceProxy;
     uint32_t m_objectID;
-    JSC::Bindings::FieldMap m_fields;
-    JSC::Bindings::MethodMap m_methods;
+    HashMap<RefPtr<StringImpl>, JSC::Bindings::Field*> m_fields;
+    HashMap<RefPtr<StringImpl>, JSC::Bindings::Method*> m_methods;
 };
     
 }

Modified: trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm (154708 => 154709)


--- trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm	2013-08-27 21:26:58 UTC (rev 154708)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm	2013-08-27 21:38:12 UTC (rev 154709)
@@ -352,7 +352,7 @@
         return 0;
     
     // If we already have an entry in the map, use it.
-    MethodMap::iterator existingMapEntry = m_methods.find(name.impl());
+    auto existingMapEntry = m_methods.find(name.impl());
     if (existingMapEntry != m_methods.end()) {
         if (existingMapEntry->value)
             return existingMapEntry->value;
@@ -374,7 +374,7 @@
         return 0;
 
     // Add a new entry to the map unless an entry was added while we were in waitForReply.
-    MethodMap::AddResult mapAddResult = m_methods.add(name.impl(), 0);
+    auto mapAddResult = m_methods.add(name.impl(), 0);
     if (mapAddResult.isNewEntry && reply->m_result)
         mapAddResult.iterator->value = new ProxyMethod(methodName);
 
@@ -391,7 +391,7 @@
         return 0;
     
     // If we already have an entry in the map, use it.
-    FieldMap::iterator existingMapEntry = m_fields.find(name.impl());
+    auto existingMapEntry = m_fields.find(name.impl());
     if (existingMapEntry != m_fields.end())
         return existingMapEntry->value;
     
@@ -411,7 +411,7 @@
         return 0;
     
     // Add a new entry to the map unless an entry was added while we were in waitForReply.
-    FieldMap::AddResult mapAddResult = m_fields.add(name.impl(), 0);
+    auto mapAddResult = m_fields.add(name.impl(), 0);
     if (mapAddResult.isNewEntry && reply->m_result)
         mapAddResult.iterator->value = new ProxyField(identifier);
     return mapAddResult.iterator->value;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to