Diff
Modified: trunk/Source/WTF/ChangeLog (169994 => 169995)
--- trunk/Source/WTF/ChangeLog 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WTF/ChangeLog 2014-06-15 23:16:31 UTC (rev 169995)
@@ -1,3 +1,12 @@
+2014-06-15 Anders Carlsson <[email protected]>
+
+ Add an autorelease() member function to RetainPtr
+ https://bugs.webkit.org/show_bug.cgi?id=133929
+
+ Reviewed by Dan Bernstein.
+
+ * wtf/RetainPtr.h:
+
2014-06-13 Alex Christensen <[email protected]>
Unreviewed disabling css jit on armv7. It's not quite ready yet.
Modified: trunk/Source/WTF/wtf/RetainPtr.h (169994 => 169995)
--- trunk/Source/WTF/wtf/RetainPtr.h 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WTF/wtf/RetainPtr.h 2014-06-15 23:16:31 UTC (rev 169995)
@@ -77,6 +77,7 @@
void clear();
PtrType leakRef() WARN_UNUSED_RETURN;
+ PtrType autorelease();
PtrType get() const { return fromStorageType(m_ptr); }
PtrType operator->() const { return fromStorageType(m_ptr); }
@@ -159,6 +160,13 @@
return ptr;
}
+#ifdef __OBJC__
+ template<typename T> inline auto RetainPtr<T>::autorelease() -> PtrType
+ {
+ return CFBridgingRelease(leakRef());
+ }
+#endif
+
template<typename T> inline RetainPtr<T>& RetainPtr<T>::operator=(const RetainPtr& o)
{
RetainPtr ptr = o;
Modified: trunk/Source/WebCore/ChangeLog (169994 => 169995)
--- trunk/Source/WebCore/ChangeLog 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebCore/ChangeLog 2014-06-15 23:16:31 UTC (rev 169995)
@@ -1,3 +1,19 @@
+2014-06-15 Anders Carlsson <[email protected]>
+
+ Add an autorelease() member function to RetainPtr
+ https://bugs.webkit.org/show_bug.cgi?id=133929
+
+ Reviewed by Dan Bernstein.
+
+ * bindings/objc/DOM.mm:
+ (-[DOMNode renderedImage]):
+ (-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):
+ * bindings/objc/DOMUIKitExtensions.mm:
+ (-[DOMHTMLImageElement dataRepresentation:]):
+ * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+ (-[WebCoreResourceHandleAsOperationQueueDelegate connection:willSendRequest:redirectResponse:]):
+ (-[WebCoreResourceHandleAsOperationQueueDelegate connection:willCacheResponse:]):
+
2014-06-14 Anders Carlsson <[email protected]>
Adopt HTTPHeaderName in ResourceResponseBase
Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (169994 => 169995)
--- trunk/Source/WebCore/bindings/objc/DOM.mm 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm 2014-06-15 23:16:31 UTC (rev 169995)
@@ -555,7 +555,7 @@
WebCore::Frame* frame = node->document().frame();
if (!frame)
return nil;
- return [createDragImageForNode(*frame, *node).leakRef() autorelease];
+ return createDragImageForNode(*frame, *node).autorelease();
}
#endif
@@ -610,12 +610,7 @@
if (!frame)
return nil;
-#if PLATFORM(IOS)
- CGImageRef dragImage = createDragImageForRange(*frame, *range, forceBlackText).leakRef();
- return dragImage ? (CGImageRef)CFAutorelease(dragImage) : nil;
-#else
- return [createDragImageForRange(*frame, *range, forceBlackText).leakRef() autorelease];
-#endif
+ return createDragImageForRange(*frame, *range, forceBlackText).autorelease();
}
- (NSArray *)textRects
Modified: trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm (169994 => 169995)
--- trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebCore/bindings/objc/DOMUIKitExtensions.mm 2014-06-15 23:16:31 UTC (rev 169995)
@@ -483,8 +483,8 @@
}
if (!data)
return nil;
-
- return [data->createNSData().leakRef() autorelease];
+
+ return data->createNSData().autorelease();
}
- (NSString *)mimeType
Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (169994 => 169995)
--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-06-15 23:16:31 UTC (rev 169995)
@@ -131,7 +131,7 @@
});
dispatch_semaphore_wait(m_semaphore, DISPATCH_TIME_FOREVER);
- return [m_requestResult.leakRef() autorelease];
+ return m_requestResult.autorelease();
}
- (void)connection:(NSURLConnection *)connection didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
@@ -333,7 +333,7 @@
});
dispatch_semaphore_wait(m_semaphore, DISPATCH_TIME_FOREVER);
- return [m_cachedResponseResult.leakRef() autorelease];
+ return m_cachedResponseResult.autorelease();
}
@end
Modified: trunk/Source/WebKit/mac/ChangeLog (169994 => 169995)
--- trunk/Source/WebKit/mac/ChangeLog 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-06-15 23:16:31 UTC (rev 169995)
@@ -1,3 +1,18 @@
+2014-06-15 Anders Carlsson <[email protected]>
+
+ Add an autorelease() member function to RetainPtr
+ https://bugs.webkit.org/show_bug.cgi?id=133929
+
+ Reviewed by Dan Bernstein.
+
+ * WebView/WebDataSource.mm:
+ (-[WebDataSource data]):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _selectionDraggingImage]):
+ (-[WebHTMLView selectionImageForcingBlackText:selectionImageForcingBlackText:]):
+ * WebView/WebResource.mm:
+ (-[WebResource data]):
+
2014-06-11 Jeremy Jones <[email protected]>
WebFrameNetworkContext should not have a sourceApplicationIdentifier in WK1.
Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (169994 => 169995)
--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2014-06-15 23:16:31 UTC (rev 169995)
@@ -526,7 +526,7 @@
RefPtr<ResourceBuffer> mainResourceData = toPrivate(_private)->loader->mainResourceData();
if (!mainResourceData)
return nil;
- return [mainResourceData->createNSData().leakRef() autorelease];
+ return mainResourceData->createNSData().autorelease();
}
- (id <WebDocumentRepresentation>)representation
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (169994 => 169995)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-06-15 23:16:31 UTC (rev 169995)
@@ -2025,9 +2025,10 @@
if (!coreFrame)
return nil;
- NSImage *dragImage = [createDragImageForSelection(*coreFrame).leakRef() autorelease];
+ auto dragImage = createDragImageForSelection(*coreFrame);
[dragImage _web_dissolveToFraction:WebDragImageAlpha];
- return dragImage;
+
+ return dragImage.autorelease();
}
- (NSRect)_selectionDraggingRect
@@ -6654,7 +6655,7 @@
#if PLATFORM(IOS)
return selectionImage(coreFrame, forceBlackText);
#else
- return [createDragImageForSelection(*coreFrame, forceBlackText).leakRef() autorelease];
+ return createDragImageForSelection(*coreFrame, forceBlackText).autorelease();
#endif
}
Modified: trunk/Source/WebKit/mac/WebView/WebResource.mm (169994 => 169995)
--- trunk/Source/WebKit/mac/WebView/WebResource.mm 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebKit/mac/WebView/WebResource.mm 2014-06-15 23:16:31 UTC (rev 169995)
@@ -211,7 +211,7 @@
return nil;
if (!_private->coreResource->data())
return nil;
- return [_private->coreResource->data()->createNSData().leakRef() autorelease];
+ return _private->coreResource->data()->createNSData().autorelease();
}
- (NSURL *)URL
Modified: trunk/Source/WebKit2/ChangeLog (169994 => 169995)
--- trunk/Source/WebKit2/ChangeLog 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-15 23:16:31 UTC (rev 169995)
@@ -1,3 +1,26 @@
+2014-06-15 Anders Carlsson <[email protected]>
+
+ Add an autorelease() member function to RetainPtr
+ https://bugs.webkit.org/show_bug.cgi?id=133929
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
+ (-[_WKRemoteObjectRegistry remoteObjectProxyWithInterface:]):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView navigationDelegate]):
+ (-[WKWebView UIDelegate]):
+ (-[WKWebView loadRequest:]):
+ (-[WKWebView loadHTMLString:baseURL:]):
+ (-[WKWebView goToBackForwardListItem:]):
+ (-[WKWebView goBack]):
+ (-[WKWebView goForward]):
+ (-[WKWebView reload]):
+ (-[WKWebView reloadFromOrigin]):
+ (-[WKWebView _historyDelegate]):
+ * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
+ (WebKit::animationValueFromKeyframeValue):
+
2014-06-15 Dan Bernstein <[email protected]>
Get rid of VoidAPICallback
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm (169994 => 169995)
--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm 2014-06-15 23:16:31 UTC (rev 169995)
@@ -77,10 +77,10 @@
return remoteObjectProxy;
RetainPtr<NSString> identifier = adoptNS([interface.identifier copy]);
- RetainPtr<WKRemoteObject> remoteObject = adoptNS([[WKRemoteObject alloc] _initWithObjectRegistry:self interface:interface]);
+ auto remoteObject = adoptNS([[WKRemoteObject alloc] _initWithObjectRegistry:self interface:interface]);
[_remoteObjectProxies setObject:remoteObject.get() forKey:identifier.get()];
- return [remoteObject.leakRef() autorelease];
+ return remoteObject.autorelease();
}
- (id)_initWithMessageSender:(IPC::MessageSender&)messageSender
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169994 => 169995)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-15 23:16:31 UTC (rev 169995)
@@ -345,7 +345,7 @@
- (id <WKNavigationDelegate>)navigationDelegate
{
- return [_navigationState->navigationDelegate().leakRef() autorelease];
+ return _navigationState->navigationDelegate().autorelease();
}
- (void)setNavigationDelegate:(id <WKNavigationDelegate>)navigationDelegate
@@ -355,7 +355,7 @@
- (id <WKUIDelegate>)UIDelegate
{
- return [_uiDelegate->delegate().leakRef() autorelease];
+ return _uiDelegate->delegate().autorelease();
}
- (void)setUIDelegate:(id<WKUIDelegate>)UIDelegate
@@ -368,7 +368,7 @@
uint64_t navigationID = _page->loadRequest(request);
auto navigation = _navigationState->createLoadRequestNavigation(navigationID, request);
- return [navigation.leakRef() autorelease];
+ return navigation.autorelease();
}
- (WKNavigation *)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL
@@ -376,7 +376,7 @@
uint64_t navigationID = _page->loadHTMLString(string, baseURL.absoluteString);
auto navigation = _navigationState->createLoadDataNavigation(navigationID);
- return [navigation.leakRef() autorelease];
+ return navigation.autorelease();
}
- (WKNavigation *)goToBackForwardListItem:(WKBackForwardListItem *)item
@@ -385,7 +385,7 @@
auto navigation = _navigationState->createBackForwardNavigation(navigationID, item._item);
- return [navigation.leakRef() autorelease];
+ return navigation.autorelease();
}
- (NSString *)title
@@ -432,7 +432,7 @@
ASSERT(_page->backForwardList().currentItem());
auto navigation = _navigationState->createBackForwardNavigation(navigationID, *_page->backForwardList().currentItem());
- return [navigation.leakRef() autorelease];
+ return navigation.autorelease();
}
- (WKNavigation *)goForward
@@ -444,7 +444,7 @@
ASSERT(_page->backForwardList().currentItem());
auto navigation = _navigationState->createBackForwardNavigation(navigationID, *_page->backForwardList().currentItem());
- return [navigation.leakRef() autorelease];
+ return navigation.autorelease();
}
- (WKNavigation *)reload
@@ -453,7 +453,7 @@
ASSERT(navigationID);
auto navigation = _navigationState->createReloadNavigation(navigationID);
- return [navigation.leakRef() autorelease];
+ return navigation.autorelease();
}
- (WKNavigation *)reloadFromOrigin
@@ -462,7 +462,7 @@
ASSERT(navigationID);
auto navigation = _navigationState->createReloadNavigation(navigationID);
- return [navigation.leakRef() autorelease];
+ return navigation.autorelease();
}
- (void)stopLoading
@@ -1356,7 +1356,7 @@
- (id <WKHistoryDelegatePrivate>)_historyDelegate
{
- return [_navigationState->historyDelegate().leakRef() autorelease];
+ return _navigationState->historyDelegate().autorelease();
}
- (void)_setHistoryDelegate:(id <WKHistoryDelegatePrivate>)historyDelegate
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm (169994 => 169995)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2014-06-15 20:50:43 UTC (rev 169994)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2014-06-15 23:16:31 UTC (rev 169995)
@@ -688,7 +688,7 @@
return [NSValue valueWithCATransform3D:keyframeValue.transformValue()];
case PlatformCAAnimationRemote::KeyframeValue::FilterKeyType:
- return [PlatformCAFilters::filterValueForOperation(keyframeValue.filterValue(), 0 /* unused */).leakRef() autorelease];
+ return PlatformCAFilters::filterValueForOperation(keyframeValue.filterValue(), 0 /* unused */).autorelease();
}
}
