Title: [93317] trunk/Source/WebKit/mac
- Revision
- 93317
- Author
- [email protected]
- Date
- 2011-08-18 10:16:17 -0700 (Thu, 18 Aug 2011)
Log Message
More C++0x libc++ build fixes
https://bugs.webkit.org/show_bug.cgi?id=66476
Reviewed by Adam Roben.
* Plugins/Hosted/NetscapePluginHostProxy.mm:
(WKPCSetException):
Use a WTF String here instead of an STL string.
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::LocalObjectMap::idForObject):
std::make_pair now takes rvalue references, so get rid of the template arguments and let
the compiler deduce them instead.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (93316 => 93317)
--- trunk/Source/WebKit/mac/ChangeLog 2011-08-18 16:56:19 UTC (rev 93316)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-08-18 17:16:17 UTC (rev 93317)
@@ -1,3 +1,19 @@
+2011-08-18 Anders Carlsson <[email protected]>
+
+ More C++0x libc++ build fixes
+ https://bugs.webkit.org/show_bug.cgi?id=66476
+
+ Reviewed by Adam Roben.
+
+ * Plugins/Hosted/NetscapePluginHostProxy.mm:
+ (WKPCSetException):
+ Use a WTF String here instead of an STL string.
+
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::idForObject):
+ std::make_pair now takes rvalue references, so get rid of the template arguments and let
+ the compiler deduce them instead.
+
2011-08-18 Adam Roben <[email protected]>
Update the device scale factor when the WebView's window changes
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (93316 => 93317)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2011-08-18 16:56:19 UTC (rev 93316)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2011-08-18 17:16:17 UTC (rev 93317)
@@ -39,7 +39,6 @@
#import <WebCore/Frame.h>
#import <WebCore/IdentifierRep.h>
#import <WebCore/ScriptController.h>
-#import <string>
extern "C" {
#import "WebKitPluginHost.h"
@@ -1125,8 +1124,7 @@
{
DataDeallocator deallocator(message, messageCnt);
- string str(message, messageCnt);
- NetscapePluginInstanceProxy::setGlobalException(str.c_str());
+ NetscapePluginInstanceProxy::setGlobalException(String::fromUTF8WithLatin1Fallback(message, messageCnt));
return KERN_SUCCESS;
}
Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (93316 => 93317)
--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2011-08-18 16:56:19 UTC (rev 93316)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2011-08-18 17:16:17 UTC (rev 93317)
@@ -150,7 +150,7 @@
} while (!m_objectIDCounter || m_objectIDCounter == static_cast<uint32_t>(-1) || m_idToJSObjectMap.contains(objectID));
m_idToJSObjectMap.set(objectID, Strong<JSObject>(globalData, object));
- m_jsObjectToIDMap.set(object, make_pair<uint32_t, uint32_t>(objectID, 1));
+ m_jsObjectToIDMap.set(object, make_pair(objectID, 1));
return objectID;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
