Title: [201981] trunk/Tools
- Revision
- 201981
- Author
- [email protected]
- Date
- 2016-06-11 16:44:50 -0700 (Sat, 11 Jun 2016)
Log Message
Unreviewed leak fix after r201863.
* DumpRenderTree/mac/DumpRenderTree.mm:
(dumpFramesAsText):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (201980 => 201981)
--- trunk/Tools/ChangeLog 2016-06-11 23:35:23 UTC (rev 201980)
+++ trunk/Tools/ChangeLog 2016-06-11 23:44:50 UTC (rev 201981)
@@ -1,3 +1,10 @@
+2016-06-11 Alexey Proskuryakov <[email protected]>
+
+ Unreviewed leak fix after r201863.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (dumpFramesAsText):
+
2016-06-11 Myles C. Maxfield <[email protected]>
[Cocoa] Map commonly used Chinese Windows font names to names present on Cocoa operating systems
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (201980 => 201981)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-06-11 23:35:23 UTC (rev 201980)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-06-11 23:44:50 UTC (rev 201981)
@@ -62,6 +62,7 @@
#import <WebKit/DOMElement.h>
#import <WebKit/DOMExtensions.h>
#import <WebKit/DOMRange.h>
+#import <WebKit/WKRetainPtr.h>
#import <WebKit/WKString.h>
#import <WebKit/WKStringCF.h>
#import <WebKit/WebArchive.h>
@@ -1531,10 +1532,10 @@
// conversion methods cannot. After the conversion to a buffer, we turn that buffer into
// a CFString via fromUTF8WithLatin1Fallback().createCFString() which can be appended to
// the result without any conversion.
- WKStringRef stringRef = WKStringCreateWithCFString((CFStringRef)innerText);
- size_t bufferSize = WKStringGetMaximumUTF8CStringSize(stringRef);
+ WKRetainPtr<WKStringRef> stringRef(AdoptWK, WKStringCreateWithCFString((CFStringRef)innerText));
+ size_t bufferSize = WKStringGetMaximumUTF8CStringSize(stringRef.get());
auto buffer = std::make_unique<char[]>(bufferSize);
- size_t stringLength = WKStringGetUTF8CStringNonStrict(stringRef, buffer.get(), bufferSize);
+ size_t stringLength = WKStringGetUTF8CStringNonStrict(stringRef.get(), buffer.get(), bufferSize);
[result appendFormat:@"%@\n", String::fromUTF8WithLatin1Fallback(buffer.get(), stringLength - 1).createCFString().get()];
if (gTestRunner->dumpChildFramesAsText()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
