Title: [129705] trunk/Source/WebKit2
- Revision
- 129705
- Author
- ander...@apple.com
- Date
- 2012-09-26 14:10:39 -0700 (Wed, 26 Sep 2012)
Log Message
Stop using CFURLCreateDataAndPropertiesFromResource
https://bugs.webkit.org/show_bug.cgi?id=97728
<rdar://problem/12379035>
Reviewed by Tim Horton.
Replace a call to CFURLCreateDataAndPropertiesFromResource with -[NSData initWithContentsOfURL:]
and add the necessary casts to make the compiler happy.
* Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
(WebKit::contentsOfPropertyListAtURL):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (129704 => 129705)
--- trunk/Source/WebKit2/ChangeLog 2012-09-26 21:03:22 UTC (rev 129704)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-26 21:10:39 UTC (rev 129705)
@@ -1,3 +1,17 @@
+2012-09-26 Anders Carlsson <ander...@apple.com>
+
+ Stop using CFURLCreateDataAndPropertiesFromResource
+ https://bugs.webkit.org/show_bug.cgi?id=97728
+ <rdar://problem/12379035>
+
+ Reviewed by Tim Horton.
+
+ Replace a call to CFURLCreateDataAndPropertiesFromResource with -[NSData initWithContentsOfURL:]
+ and add the necessary casts to make the compiler happy.
+
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ (WebKit::contentsOfPropertyListAtURL):
+
2012-09-26 Alexey Proskuryakov <a...@apple.com>
[WK2] Update WebPageProxy::reattachToWebProcess() for multi-web process mode
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (129704 => 129705)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2012-09-26 21:03:22 UTC (rev 129704)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2012-09-26 21:10:39 UTC (rev 129705)
@@ -93,14 +93,11 @@
static RetainPtr<CFDictionaryRef> contentsOfPropertyListAtURL(CFURLRef propertyListURL)
{
- CFDataRef propertyListData;
- CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, propertyListURL, &propertyListData, 0, 0, 0);
+ RetainPtr<NSData> propertyListData = adoptNS([[NSData alloc] initWithContentsOfURL:(NSURL *)propertyListURL]);
if (!propertyListData)
return 0;
- RetainPtr<CFPropertyListRef> propertyList(AdoptCF, CFPropertyListCreateWithData(kCFAllocatorDefault, propertyListData, kCFPropertyListImmutable, 0, 0));
- CFRelease(propertyListData);
-
+ RetainPtr<CFPropertyListRef> propertyList(AdoptCF, CFPropertyListCreateWithData(kCFAllocatorDefault, (CFDataRef)propertyListData.get(), kCFPropertyListImmutable, 0, 0));
if (!propertyList)
return 0;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
