Diff
Modified: trunk/Source/WebKit2/ChangeLog (183104 => 183105)
--- trunk/Source/WebKit2/ChangeLog 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-22 15:28:16 UTC (rev 183105)
@@ -1,3 +1,136 @@
+2015-04-22 Zan Dobersek <[email protected]>
+
+ [WK2] Have API::Array creation methods return Ref<>
+ https://bugs.webkit.org/show_bug.cgi?id=143933
+
+ Reviewed by Darin Adler.
+
+ API::Array::create() and API::Array::createStringArray() should return Ref<> objects
+ as the return values are never null. It's up to the caller to implicitly convert the
+ returned objects to RefPtr<> if so required. All the call-sites have been updated to
+ reflect that.
+
+ * Shared/API/APIArray.cpp:
+ (API::Array::create):
+ (API::Array::createStringArray):
+ (API::Array::copy):
+ * Shared/API/APIArray.h:
+ * Shared/API/APIDictionary.cpp:
+ (API::Dictionary::keys):
+ * Shared/API/APIDictionary.h:
+ * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+ (ensureObjectStream):
+ * Shared/API/c/WKArray.cpp:
+ (WKArrayCreate):
+ (WKArrayCreateAdoptingValues):
+ * Shared/API/c/WKContextMenuItem.cpp:
+ (WKContextMenuCopySubmenuItems):
+ * Shared/API/c/WKDictionary.cpp:
+ (WKDictionaryCopyKeys):
+ * Shared/API/c/WKMutableArray.cpp:
+ (WKMutableArrayCreate):
+ * Shared/Cocoa/WKNSDictionary.mm:
+ (-[WKNSDictionary keyEnumerator]):
+ * Shared/SecurityOriginData.cpp:
+ (WebKit::performAPICallbackWithSecurityOriginDataVector):
+ * Shared/WebContextMenuItem.cpp:
+ (WebKit::WebContextMenuItem::submenuItemsAsAPIArray):
+ * Shared/WebContextMenuItem.h:
+ * Shared/WebOpenPanelParameters.cpp:
+ (WebKit::WebOpenPanelParameters::acceptMIMETypes):
+ (WebKit::WebOpenPanelParameters::selectedFileNames):
+ * Shared/WebOpenPanelParameters.h:
+ * UIProcess/API/C/WKBackForwardListRef.cpp:
+ (WKBackForwardListCopyBackListWithLimit):
+ (WKBackForwardListCopyForwardListWithLimit):
+ * UIProcess/API/C/WKGrammarDetail.cpp:
+ (WKGrammarDetailCopyGuesses):
+ * UIProcess/API/C/WKOpenPanelParameters.cpp:
+ (WKOpenPanelParametersCopyAcceptedMIMETypes):
+ (WKOpenPanelParametersCopySelectedFileNames):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageContextMenuClient):
+ (WKPageCopyRelatedPages):
+ * UIProcess/API/Cocoa/WKBackForwardList.mm:
+ (-[WKBackForwardList backList]):
+ (-[WKBackForwardList forwardList]):
+ * UIProcess/API/Cocoa/WKBrowsingContextGroup.mm:
+ (createWKArray):
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
+ * UIProcess/API/gtk/WebKitBackForwardList.cpp:
+ (webkit_back_forward_list_get_back_list_with_limit):
+ (webkit_back_forward_list_get_forward_list_with_limit):
+ * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+ (webkit_file_chooser_request_get_mime_types):
+ (webkit_file_chooser_request_get_mime_types_filter):
+ (webkit_file_chooser_request_select_files):
+ * UIProcess/API/gtk/WebKitNotificationProvider.cpp:
+ (WebKitNotificationProvider::notificationCloseCallback):
+ * UIProcess/Notifications/WebNotificationManagerProxy.cpp:
+ (WebKit::WebNotificationManagerProxy::populateCopyOfNotificationPermissions):
+ * UIProcess/Notifications/WebNotificationProvider.cpp:
+ (WebKit::WebNotificationProvider::clearNotifications):
+ * UIProcess/Plugins/WebPluginSiteDataManager.cpp:
+ (WebKit::WebPluginSiteDataManager::didGetSitesWithData):
+ * UIProcess/StatisticsRequest.cpp:
+ (WebKit::StatisticsRequest::completedRequest):
+ * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
+ (WebKit::WebUserContentControllerProxy::WebUserContentControllerProxy):
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::backList):
+ (WebKit::WebBackForwardList::forwardList):
+ (WebKit::WebBackForwardList::backListAsAPIArrayWithLimit):
+ (WebKit::WebBackForwardList::forwardListAsAPIArrayWithLimit):
+ * UIProcess/WebBackForwardList.h:
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::didGetHostnamesWithCookies):
+ * UIProcess/WebDatabaseManagerProxy.cpp:
+ (WebKit::WebDatabaseManagerProxy::didGetDatabasesByOrigin):
+ (WebKit::WebDatabaseManagerProxy::didGetDatabaseOrigins):
+ * UIProcess/WebGrammarDetail.cpp:
+ (WebKit::WebGrammarDetail::guesses):
+ * UIProcess/WebGrammarDetail.h:
+ * UIProcess/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+ (WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
+ * UIProcess/WebMediaCacheManagerProxy.cpp:
+ (WebKit::WebMediaCacheManagerProxy::didGetHostnamesWithMediaCache):
+ * UIProcess/WebOriginDataManagerProxy.cpp:
+ (WebKit::WebOriginDataManagerProxy::didGetOrigins):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didFindStringMatches):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::pluginInfoStoreDidLoadPlugins):
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel _chooseFiles:displayString:iconImage:]):
+ (-[WKFileUploadPanel presentWithParameters:resultListener:]):
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
+ (-[WKWebProcessPlugInFrame childFrames]):
+ * WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp:
+ (WKBundleBackForwardListItemCopyChildren):
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+ (WKBundleFrameCopyChildFrames):
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageCopyTrackedRepaintRects):
+ * WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp:
+ (WebKit::InjectedBundleBackForwardListItem::children):
+ * WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
+ (WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems):
+ * WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp:
+ (WebKit::InjectedBundlePageFormClient::didAssociateFormControls):
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ (WebKit::InjectedBundlePageLoaderClient::featuresUsedInPage):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::findLargestFrameInFrameSet):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::childFrames):
+ * WebProcess/WebPage/WebFrame.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::trackedRepaintRects):
+ * WebProcess/WebPage/WebPage.h:
+
2015-04-21 Eric Carlson <[email protected]>
[Mac] Use one playback target for all web processes
Modified: trunk/Source/WebKit2/Shared/API/APIArray.cpp (183104 => 183105)
--- trunk/Source/WebKit2/Shared/API/APIArray.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/API/APIArray.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -30,17 +30,17 @@
namespace API {
-PassRefPtr<Array> Array::create()
+Ref<Array> Array::create()
{
return create(Vector<RefPtr<Object>>());
}
-PassRefPtr<Array> Array::create(Vector<RefPtr<Object>>&& elements)
+Ref<Array> Array::create(Vector<RefPtr<Object>>&& elements)
{
return adoptRef(*new Array(WTF::move(elements)));
}
-PassRefPtr<Array> Array::createStringArray(const Vector<WTF::String>& strings)
+Ref<Array> Array::createStringArray(const Vector<WTF::String>& strings)
{
Vector<RefPtr<Object>> elements;
elements.reserveInitialCapacity(strings.size());
@@ -69,13 +69,13 @@
{
size_t size = this->size();
if (!size)
- return *Array::create();
+ return Array::create();
Vector<RefPtr<Object>> elements;
elements.reserveInitialCapacity(size);
for (const auto& entry : this->elements())
elements.uncheckedAppend(entry);
- return *Array::create(WTF::move(elements));
+ return Array::create(WTF::move(elements));
}
Array::~Array()
Modified: trunk/Source/WebKit2/Shared/API/APIArray.h (183104 => 183105)
--- trunk/Source/WebKit2/Shared/API/APIArray.h 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/API/APIArray.h 2015-04-22 15:28:16 UTC (rev 183105)
@@ -30,7 +30,6 @@
#include <wtf/Forward.h>
#include <wtf/IteratorAdaptors.h>
#include <wtf/IteratorRange.h>
-#include <wtf/PassRefPtr.h>
#include <wtf/Vector.h>
namespace API {
@@ -51,9 +50,9 @@
using ElementsOfTypeRange = WTF::IteratorRange<WTF::TransformIterator<GetObjectTransform<T>, WTF::FilterIterator<IsTypePredicate<T>, Vector<RefPtr<Object>>::const_iterator>>>;
public:
- static PassRefPtr<Array> create();
- static PassRefPtr<Array> create(Vector<RefPtr<Object>>&&);
- static PassRefPtr<Array> createStringArray(const Vector<WTF::String>&);
+ static Ref<Array> create();
+ static Ref<Array> create(Vector<RefPtr<Object>>&&);
+ static Ref<Array> createStringArray(const Vector<WTF::String>&);
Vector<WTF::String> toStringVector();
Ref<Array> copy();
Modified: trunk/Source/WebKit2/Shared/API/APIDictionary.cpp (183104 => 183105)
--- trunk/Source/WebKit2/Shared/API/APIDictionary.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/API/APIDictionary.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -50,7 +50,7 @@
{
}
-PassRefPtr<Array> Dictionary::keys() const
+Ref<Array> Dictionary::keys() const
{
if (m_map.isEmpty())
return API::Array::create();
Modified: trunk/Source/WebKit2/Shared/API/APIDictionary.h (183104 => 183105)
--- trunk/Source/WebKit2/Shared/API/APIDictionary.h 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/API/APIDictionary.h 2015-04-22 15:28:16 UTC (rev 183105)
@@ -70,7 +70,7 @@
return it->value.get();
}
- PassRefPtr<Array> keys() const;
+ Ref<Array> keys() const;
bool add(const WTF::String& key, PassRefPtr<Object>);
bool set(const WTF::String& key, PassRefPtr<Object>);
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (183104 => 183105)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2015-04-22 15:28:16 UTC (rev 183105)
@@ -92,10 +92,10 @@
if (encoder->_objectStream)
return;
- RefPtr<API::Array> objectStream = API::Array::create();
- encoder->_objectStream = objectStream.get();
+ Ref<API::Array> objectStream = API::Array::create();
+ encoder->_objectStream = objectStream.ptr();
- encoder->_rootDictionary->set(objectStreamKey, objectStream.release());
+ encoder->_rootDictionary->set(objectStreamKey, WTF::move(objectStream));
}
static void encodeToObjectStream(WKRemoteObjectEncoder *encoder, id value)
Modified: trunk/Source/WebKit2/Shared/API/c/WKArray.cpp (183104 => 183105)
--- trunk/Source/WebKit2/Shared/API/c/WKArray.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/API/c/WKArray.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -44,7 +44,7 @@
for (size_t i = 0; i < numberOfValues; ++i)
elements.uncheckedAppend(toImpl(values[i]));
- return toAPI(API::Array::create(WTF::move(elements)).leakRef());
+ return toAPI(&API::Array::create(WTF::move(elements)).leakRef());
}
WKArrayRef WKArrayCreateAdoptingValues(WKTypeRef* values, size_t numberOfValues)
@@ -55,7 +55,7 @@
for (size_t i = 0; i < numberOfValues; ++i)
elements.uncheckedAppend(adoptRef(toImpl(values[i])));
- return toAPI(API::Array::create(WTF::move(elements)).leakRef());
+ return toAPI(&API::Array::create(WTF::move(elements)).leakRef());
}
WKTypeRef WKArrayGetItemAtIndex(WKArrayRef arrayRef, size_t index)
Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp (183104 => 183105)
--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -143,7 +143,7 @@
WKArrayRef WKContextMenuCopySubmenuItems(WKContextMenuItemRef itemRef)
{
#if ENABLE(CONTEXT_MENUS)
- return toAPI(toImpl(itemRef)->submenuItemsAsAPIArray().leakRef());
+ return toAPI(&toImpl(itemRef)->submenuItemsAsAPIArray().leakRef());
#else
UNUSED_PARAM(itemRef);
return 0;
Modified: trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp (183104 => 183105)
--- trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -58,6 +58,5 @@
WKArrayRef WKDictionaryCopyKeys(WKDictionaryRef dictionaryRef)
{
- RefPtr<API::Array> keys = toImpl(dictionaryRef)->keys();
- return toAPI(keys.release().leakRef());
+ return toAPI(&toImpl(dictionaryRef)->keys().leakRef());
}
Modified: trunk/Source/WebKit2/Shared/API/c/WKMutableArray.cpp (183104 => 183105)
--- trunk/Source/WebKit2/Shared/API/c/WKMutableArray.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/API/c/WKMutableArray.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -33,7 +33,7 @@
WKMutableArrayRef WKMutableArrayCreate()
{
- return const_cast<WKMutableArrayRef>(toAPI(API::Array::create().leakRef()));
+ return const_cast<WKMutableArrayRef>(toAPI(&API::Array::create().leakRef()));
}
void WKArrayAppendItem(WKMutableArrayRef arrayRef, WKTypeRef itemRef)
Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSDictionary.mm (183104 => 183105)
--- trunk/Source/WebKit2/Shared/Cocoa/WKNSDictionary.mm 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSDictionary.mm 2015-04-22 15:28:16 UTC (rev 183105)
@@ -71,7 +71,7 @@
- (NSEnumerator *)keyEnumerator
{
- return [wrapper(*_dictionary->keys()) objectEnumerator];
+ return [wrapper(_dictionary->keys()) objectEnumerator];
}
#pragma mark NSCopying protocol implementation
Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.cpp (183104 => 183105)
--- trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -98,7 +98,7 @@
securityOrigins.uncheckedAppend(WTF::move(origin));
}
- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).get());
+ callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).ptr());
}
bool operator==(const SecurityOriginData& a, const SecurityOriginData& b)
Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp (183104 => 183105)
--- trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -68,7 +68,7 @@
return separatorItem;
}
-PassRefPtr<API::Array> WebContextMenuItem::submenuItemsAsAPIArray() const
+Ref<API::Array> WebContextMenuItem::submenuItemsAsAPIArray() const
{
if (m_webContextMenuItemData.type() != WebCore::SubmenuType)
return API::Array::create();
Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.h (183104 => 183105)
--- trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2015-04-22 15:28:16 UTC (rev 183105)
@@ -57,7 +57,7 @@
static PassRefPtr<WebContextMenuItem> create(const String& title, bool enabled, API::Array* submenuItems);
static WebContextMenuItem* separatorItem();
- PassRefPtr<API::Array> submenuItemsAsAPIArray() const;
+ Ref<API::Array> submenuItemsAsAPIArray() const;
API::Object* userData() const;
void setUserData(API::Object*);
Modified: trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp (183104 => 183105)
--- trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -49,7 +49,7 @@
{
}
-PassRefPtr<API::Array> WebOpenPanelParameters::acceptMIMETypes() const
+Ref<API::Array> WebOpenPanelParameters::acceptMIMETypes() const
{
return API::Array::createStringArray(m_settings.acceptMIMETypes);
}
@@ -61,7 +61,7 @@
}
#endif
-PassRefPtr<API::Array> WebOpenPanelParameters::selectedFileNames() const
+Ref<API::Array> WebOpenPanelParameters::selectedFileNames() const
{
return API::Array::createStringArray(m_settings.selectedFiles);
}
Modified: trunk/Source/WebKit2/Shared/WebOpenPanelParameters.h (183104 => 183105)
--- trunk/Source/WebKit2/Shared/WebOpenPanelParameters.h 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/Shared/WebOpenPanelParameters.h 2015-04-22 15:28:16 UTC (rev 183105)
@@ -44,8 +44,8 @@
~WebOpenPanelParameters();
bool allowMultipleFiles() const { return m_settings.allowsMultipleFiles; }
- PassRefPtr<API::Array> acceptMIMETypes() const;
- PassRefPtr<API::Array> selectedFileNames() const;
+ Ref<API::Array> acceptMIMETypes() const;
+ Ref<API::Array> selectedFileNames() const;
#if ENABLE(MEDIA_CAPTURE)
bool capture() const;
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -74,10 +74,10 @@
WKArrayRef WKBackForwardListCopyBackListWithLimit(WKBackForwardListRef listRef, unsigned limit)
{
- return toAPI(toImpl(listRef)->backListAsAPIArrayWithLimit(limit).leakRef());
+ return toAPI(&toImpl(listRef)->backListAsAPIArrayWithLimit(limit).leakRef());
}
WKArrayRef WKBackForwardListCopyForwardListWithLimit(WKBackForwardListRef listRef, unsigned limit)
{
- return toAPI(toImpl(listRef)->forwardListAsAPIArrayWithLimit(limit).leakRef());
+ return toAPI(&toImpl(listRef)->forwardListAsAPIArrayWithLimit(limit).leakRef());
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -56,7 +56,7 @@
WKArrayRef WKGrammarDetailCopyGuesses(WKGrammarDetailRef grammarDetailRef)
{
- return toAPI(toImpl(grammarDetailRef)->guesses().leakRef());
+ return toAPI(&toImpl(grammarDetailRef)->guesses().leakRef());
}
WKStringRef WKGrammarDetailCopyUserDescription(WKGrammarDetailRef grammarDetailRef)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -45,7 +45,7 @@
WKArrayRef WKOpenPanelParametersCopyAcceptedMIMETypes(WKOpenPanelParametersRef parametersRef)
{
- return toAPI(toImpl(parametersRef)->acceptMIMETypes().leakRef());
+ return toAPI(&toImpl(parametersRef)->acceptMIMETypes().leakRef());
}
// Deprecated.
@@ -66,5 +66,5 @@
WKArrayRef WKOpenPanelParametersCopySelectedFileNames(WKOpenPanelParametersRef parametersRef)
{
- return toAPI(toImpl(parametersRef)->selectedFileNames().leakRef());
+ return toAPI(&toImpl(parametersRef)->selectedFileNames().leakRef());
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -761,9 +761,9 @@
WKArrayRef newMenu = nullptr;
if (m_client.base.version >= 2) {
RefPtr<WebHitTestResult> webHitTestResult = WebHitTestResult::create(hitTestResultData);
- m_client.getContextMenuFromProposedMenu(toAPI(&page), toAPI(API::Array::create(WTF::move(proposedMenuItems)).get()), &newMenu, toAPI(webHitTestResult.get()), toAPI(userData), m_client.base.clientInfo);
+ m_client.getContextMenuFromProposedMenu(toAPI(&page), toAPI(API::Array::create(WTF::move(proposedMenuItems)).ptr()), &newMenu, toAPI(webHitTestResult.get()), toAPI(userData), m_client.base.clientInfo);
} else
- m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0(toAPI(&page), toAPI(API::Array::create(WTF::move(proposedMenuItems)).get()), &newMenu, toAPI(userData), m_client.base.clientInfo);
+ m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0(toAPI(&page), toAPI(API::Array::create(WTF::move(proposedMenuItems)).ptr()), &newMenu, toAPI(userData), m_client.base.clientInfo);
RefPtr<API::Array> array = adoptRef(toImpl(newMenu));
@@ -810,7 +810,7 @@
for (const auto& menuItem : menuItemsVector)
menuItems.uncheckedAppend(menuItem);
- m_client.showContextMenu(toAPI(&page), toAPI(menuLocation), toAPI(API::Array::create(WTF::move(menuItems)).get()), m_client.base.clientInfo);
+ m_client.showContextMenu(toAPI(&page), toAPI(menuLocation), toAPI(API::Array::create(WTF::move(menuItems)).ptr()), m_client.base.clientInfo);
return true;
}
@@ -2129,7 +2129,7 @@
relatedPages.append(page);
}
- return toAPI(API::Array::create(WTF::move(relatedPages)).leakRef());
+ return toAPI(&API::Array::create(WTF::move(relatedPages)).leakRef());
}
void WKPageSetMayStartMediaWhenInWindow(WKPageRef pageRef, bool mayStartMedia)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2015-04-22 15:28:16 UTC (rev 183105)
@@ -74,14 +74,12 @@
- (NSArray *)backList
{
- RefPtr<API::Array> list = _list->backList();
- return [wrapper(*list.release().leakRef()) autorelease];
+ return [wrapper(_list->backList().leakRef()) autorelease];
}
- (NSArray *)forwardList
{
- RefPtr<API::Array> list = _list->forwardList();
- return [wrapper(*list.release().leakRef()) autorelease];
+ return [wrapper(_list->forwardList().leakRef()) autorelease];
}
#pragma mark WKObject protocol implementation
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm 2015-04-22 15:28:16 UTC (rev 183105)
@@ -126,7 +126,7 @@
strings.uncheckedAppend(adoptRef(toImpl(WKStringCreateWithCFString((CFStringRef)entry))));
}
- return toAPI(API::Array::create(WTF::move(strings)).leakRef());
+ return toAPI(&API::Array::create(WTF::move(strings)).leakRef());
}
-(void)addUserStyleSheet:(NSString *)source baseURL:(NSURL *)baseURL whitelistedURLPatterns:(NSArray *)whitelist blacklistedURLPatterns:(NSArray *)blacklist mainFrameOnly:(BOOL)mainFrameOnly
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-04-22 15:28:16 UTC (rev 183105)
@@ -85,7 +85,7 @@
for (auto& websiteDataRecord : websiteDataRecords)
elements.uncheckedAppend(API::WebsiteDataRecord::create(WTF::move(websiteDataRecord)));
- completionHandlerCopy(wrapper(*API::Array::create(WTF::move(elements))));
+ completionHandlerCopy(wrapper(API::Array::create(WTF::move(elements))));
Block_release(completionHandlerCopy);
});
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -250,8 +250,8 @@
g_return_val_if_fail(WEBKIT_IS_BACK_FORWARD_LIST(backForwardList), 0);
WebKitBackForwardListPrivate* priv = backForwardList->priv;
- RefPtr<API::Array> apiArray = priv->backForwardItems->backListAsAPIArrayWithLimit(limit);
- return webkitBackForwardListCreateList(backForwardList, apiArray.get());
+ Ref<API::Array> apiArray = priv->backForwardItems->backListAsAPIArrayWithLimit(limit);
+ return webkitBackForwardListCreateList(backForwardList, apiArray.ptr());
}
/**
@@ -281,6 +281,6 @@
g_return_val_if_fail(WEBKIT_IS_BACK_FORWARD_LIST(backForwardList), 0);
WebKitBackForwardListPrivate* priv = backForwardList->priv;
- RefPtr<API::Array> apiArray = priv->backForwardItems->forwardListAsAPIArrayWithLimit(limit);
- return webkitBackForwardListCreateList(backForwardList, apiArray.get());
+ Ref<API::Array> apiArray = priv->backForwardItems->forwardListAsAPIArrayWithLimit(limit);
+ return webkitBackForwardListCreateList(backForwardList, apiArray.ptr());
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -206,7 +206,7 @@
if (request->priv->mimeTypes)
return reinterpret_cast<gchar**>(request->priv->mimeTypes->pdata);
- RefPtr<API::Array> mimeTypes = request->priv->parameters->acceptMIMETypes();
+ Ref<API::Array> mimeTypes = request->priv->parameters->acceptMIMETypes();
size_t numOfMimeTypes = mimeTypes->size();
if (!numOfMimeTypes)
return 0;
@@ -247,7 +247,7 @@
if (request->priv->filter)
return request->priv->filter.get();
- RefPtr<API::Array> mimeTypes = request->priv->parameters->acceptMIMETypes();
+ Ref<API::Array> mimeTypes = request->priv->parameters->acceptMIMETypes();
size_t numOfMimeTypes = mimeTypes->size();
if (!numOfMimeTypes)
return 0;
@@ -315,7 +315,7 @@
g_ptr_array_add(selectedFiles.get(), 0);
// Select the files in WebCore and update local private attributes.
- request->priv->listener->chooseFiles(API::Array::create(WTF::move(choosenFiles)).get());
+ request->priv->listener->chooseFiles(API::Array::create(WTF::move(choosenFiles)).ptr());
request->priv->selectedFiles = selectedFiles;
request->priv->handledRequest = true;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationProvider.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationProvider.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationProvider.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -91,7 +91,7 @@
uint64_t notificationID = webkit_notification_get_id(notification);
Vector<RefPtr<API::Object>> arrayIDs;
arrayIDs.append(API::UInt64::create(notificationID));
- provider->m_notificationManager->providerDidCloseNotifications(API::Array::create(WTF::move(arrayIDs)).get());
+ provider->m_notificationManager->providerDidCloseNotifications(API::Array::create(WTF::move(arrayIDs)).ptr());
provider->m_notifications.remove(notificationID);
}
Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -91,7 +91,7 @@
return;
permissions.clear();
- RefPtr<API::Array> knownOrigins = knownPermissions->keys();
+ Ref<API::Array> knownOrigins = knownPermissions->keys();
for (size_t i = 0; i < knownOrigins->size(); ++i) {
API::String* origin = knownOrigins->at<API::String>(i);
permissions.set(origin->string(), knownPermissions->get<API::Boolean>(origin->string())->value());
Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -72,7 +72,7 @@
for (const auto& notificationID : notificationIDs)
arrayIDs.uncheckedAppend(API::UInt64::create(notificationID));
- m_client.clearNotifications(toAPI(API::Array::create(WTF::move(arrayIDs)).get()), m_client.base.clientInfo);
+ m_client.clearNotifications(toAPI(API::Array::create(WTF::move(arrayIDs)).ptr()), m_client.base.clientInfo);
}
void WebNotificationProvider::addNotificationManager(WebNotificationManagerProxy* manager)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -165,7 +165,7 @@
return;
}
- callback->performCallbackWithReturnValue(API::Array::createStringArray(sites).get());
+ callback->performCallbackWithReturnValue(API::Array::createStringArray(sites).ptr());
}
void WebPluginSiteDataManager::clearSiteData(API::Array* sites, uint64_t flags, uint64_t maxAgeInSeconds, std::function<void (CallbackBase::Error)> callbackFunction)
Modified: trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -90,7 +90,7 @@
for (const auto& statistic : data.webCoreCacheStatistics)
cacheStatistics.uncheckedAppend(createDictionaryFromHashMap(statistic));
- m_responseDictionary->set("WebCoreCacheStatistics", API::Array::create(WTF::move(cacheStatistics)).get());
+ m_responseDictionary->set("WebCoreCacheStatistics", API::Array::create(WTF::move(cacheStatistics)));
}
if (m_outstandingRequests.isEmpty()) {
Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -51,7 +51,7 @@
WebUserContentControllerProxy::WebUserContentControllerProxy()
: m_identifier(generateIdentifier())
- , m_userScripts(*API::Array::create())
+ , m_userScripts(API::Array::create())
{
}
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -250,17 +250,17 @@
return m_page && m_hasCurrentIndex ? m_entries.size() - (m_currentIndex + 1) : 0;
}
-PassRefPtr<API::Array> WebBackForwardList::backList() const
+Ref<API::Array> WebBackForwardList::backList() const
{
return backListAsAPIArrayWithLimit(backListCount());
}
-PassRefPtr<API::Array> WebBackForwardList::forwardList() const
+Ref<API::Array> WebBackForwardList::forwardList() const
{
return forwardListAsAPIArrayWithLimit(forwardListCount());
}
-PassRefPtr<API::Array> WebBackForwardList::backListAsAPIArrayWithLimit(unsigned limit) const
+Ref<API::Array> WebBackForwardList::backListAsAPIArrayWithLimit(unsigned limit) const
{
ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
@@ -284,7 +284,7 @@
return API::Array::create(WTF::move(vector));
}
-PassRefPtr<API::Array> WebBackForwardList::forwardListAsAPIArrayWithLimit(unsigned limit) const
+Ref<API::Array> WebBackForwardList::forwardListAsAPIArrayWithLimit(unsigned limit) const
{
ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2015-04-22 15:28:16 UTC (rev 183105)
@@ -66,11 +66,11 @@
int backListCount() const;
int forwardListCount() const;
- PassRefPtr<API::Array> backList() const;
- PassRefPtr<API::Array> forwardList() const;
+ Ref<API::Array> backList() const;
+ Ref<API::Array> forwardList() const;
- PassRefPtr<API::Array> backListAsAPIArrayWithLimit(unsigned limit) const;
- PassRefPtr<API::Array> forwardListAsAPIArrayWithLimit(unsigned limit) const;
+ Ref<API::Array> backListAsAPIArrayWithLimit(unsigned limit) const;
+ Ref<API::Array> forwardListAsAPIArrayWithLimit(unsigned limit) const;
BackForwardListState backForwardListState(const std::function<bool (WebBackForwardListItem&)>&) const;
void restoreFromState(BackForwardListState);
Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -116,7 +116,7 @@
return;
}
- callback->performCallbackWithReturnValue(API::Array::createStringArray(hostnames).get());
+ callback->performCallbackWithReturnValue(API::Array::createStringArray(hostnames).ptr());
}
void WebCookieManagerProxy::deleteCookiesForHostname(const String& hostname)
Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -200,7 +200,7 @@
result.uncheckedAppend(API::Dictionary::create(WTF::move(originAndDatabasesMap)));
}
- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(result)).get());
+ callback->performCallbackWithReturnValue(API::Array::create(WTF::move(result)).ptr());
}
void WebDatabaseManagerProxy::getDatabaseOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
@@ -226,7 +226,7 @@
for (const auto& originIdentifier : originIdentifiers)
securityOrigins.uncheckedAppend(API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier)));
- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).get());
+ callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).ptr());
}
void WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, API::SecurityOrigin* origin)
Modified: trunk/Source/WebKit2/UIProcess/WebGrammarDetail.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebGrammarDetail.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebGrammarDetail.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -55,7 +55,7 @@
m_grammarDetail.userDescription = userDescription;
}
-PassRefPtr<API::Array> WebGrammarDetail::guesses() const
+Ref<API::Array> WebGrammarDetail::guesses() const
{
size_t numGuesses = m_grammarDetail.guesses.size();
Vector<RefPtr<API::Object> > wkGuesses(numGuesses);
Modified: trunk/Source/WebKit2/UIProcess/WebGrammarDetail.h (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebGrammarDetail.h 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebGrammarDetail.h 2015-04-22 15:28:16 UTC (rev 183105)
@@ -41,7 +41,7 @@
int location() const { return m_grammarDetail.location; }
int length() const { return m_grammarDetail.length; }
- PassRefPtr<API::Array> guesses() const;
+ Ref<API::Array> guesses() const;
const String& userDescription() const { return m_grammarDetail.userDescription; }
const WebCore::GrammarDetail& grammarDetail() { return m_grammarDetail; }
Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -93,7 +93,7 @@
StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
if (!storageManager) {
RunLoop::main().dispatch([callbackFunction] {
- callbackFunction(API::Array::create().get(), CallbackBase::Error::None);
+ callbackFunction(API::Array::create().ptr(), CallbackBase::Error::None);
});
return;
}
@@ -104,7 +104,7 @@
for (auto& origin : securityOrigins)
webSecurityOrigins.uncheckedAppend(API::SecurityOrigin::create(WTF::move(origin)));
- callbackFunction(API::Array::create(WTF::move(webSecurityOrigins)).get(), CallbackBase::Error::None);
+ callbackFunction(API::Array::create(WTF::move(webSecurityOrigins)).ptr(), CallbackBase::Error::None);
});
}
@@ -113,7 +113,7 @@
StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
if (!storageManager) {
RunLoop::main().dispatch([callbackFunction] {
- callbackFunction(API::Array::create().get(), CallbackBase::Error::None);
+ callbackFunction(API::Array::create().ptr(), CallbackBase::Error::None);
});
return;
}
@@ -137,7 +137,7 @@
result.uncheckedAppend(API::Dictionary::create(WTF::move(detailsMap)));
}
- callbackFunction(API::Array::create(WTF::move(result)).get(), CallbackBase::Error::None);
+ callbackFunction(API::Array::create(WTF::move(result)).ptr(), CallbackBase::Error::None);
});
}
Modified: trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -98,7 +98,7 @@
return;
}
- callback->performCallbackWithReturnValue(API::Array::createStringArray(hostnames).get());
+ callback->performCallbackWithReturnValue(API::Array::createStringArray(hostnames).ptr());
}
void WebMediaCacheManagerProxy::clearCacheForHostname(const String& hostname)
Modified: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -202,7 +202,7 @@
for (const auto& originIdentifier : originIdentifiers)
securityOrigins.uncheckedAppend(API::SecurityOrigin::create(originIdentifier.securityOrigin()));
- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).get());
+ callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).ptr());
}
void WebOriginDataManagerProxy::deleteEntriesForOrigin(WKOriginDataTypes types, API::SecurityOrigin* origin, std::function<void (CallbackBase::Error)> callbackFunction)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -3934,7 +3934,7 @@
matches.uncheckedAppend(API::Array::create(WTF::move(apiRects)));
}
- m_findMatchesClient.didFindStringMatches(this, string, API::Array::create(WTF::move(matches)).get(), firstIndexAfterSelection);
+ m_findMatchesClient.didFindStringMatches(this, string, API::Array::create(WTF::move(matches)).ptr(), firstIndexAfterSelection);
}
void WebPageProxy::didFailToFindString(const String& string)
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -1419,7 +1419,7 @@
plugins.uncheckedAppend(API::Dictionary::create(WTF::move(map)));
}
- m_client.plugInInformationBecameAvailable(this, API::Array::create(WTF::move(plugins)).get());
+ m_client.plugInInformationBecameAvailable(this, API::Array::create(WTF::move(plugins)).ptr());
}
void WebProcessPool::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (183104 => 183105)
--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-04-22 15:28:16 UTC (rev 183105)
@@ -338,14 +338,14 @@
urls.reserveInitialCapacity(count);
for (NSURL *fileURL in fileURLs)
urls.uncheckedAppend(adoptRef(toImpl(WKURLCreateWithCFURL((CFURLRef)fileURL))));
- RefPtr<API::Array> fileURLsRef = API::Array::create(WTF::move(urls));
+ Ref<API::Array> fileURLsRef = API::Array::create(WTF::move(urls));
NSData *jpeg = UIImageJPEGRepresentation(iconImage, 1.0);
RefPtr<API::Data> iconImageDataRef = adoptRef(toImpl(WKDataCreate(reinterpret_cast<const unsigned char*>([jpeg bytes]), [jpeg length])));
RefPtr<API::String> displayStringRef = adoptRef(toImpl(WKStringCreateWithCFString((CFStringRef)displayString)));
- _listener->chooseFiles(fileURLsRef.get(), displayStringRef.get(), iconImageDataRef.get());
+ _listener->chooseFiles(fileURLsRef.ptr(), displayStringRef.get(), iconImageDataRef.get());
[self _dispatchDidDismiss];
}
@@ -359,7 +359,7 @@
_allowMultipleFiles = parameters->allowMultipleFiles();
_interactionPoint = [_view lastInteractionLocation];
- RefPtr<API::Array> acceptMimeTypes = parameters->acceptMIMETypes();
+ Ref<API::Array> acceptMimeTypes = parameters->acceptMIMETypes();
NSMutableArray *mimeTypes = [NSMutableArray arrayWithCapacity:acceptMimeTypes->size()];
for (const auto& mimeType : acceptMimeTypes->elementsOfType<API::String>())
[mimeTypes addObject:mimeType->string()];
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2015-04-22 15:28:16 UTC (rev 183105)
@@ -90,7 +90,7 @@
- (NSArray *)childFrames
{
- return [wrapper(*_frame->childFrames().leakRef()) autorelease];
+ return [wrapper(_frame->childFrames().leakRef()) autorelease];
}
- (BOOL)containsAnyFormElements
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -79,6 +79,6 @@
WKArrayRef WKBundleBackForwardListItemCopyChildren(WKBundleBackForwardListItemRef itemRef)
{
- return toAPI(toImpl(itemRef)->children().leakRef());
+ return toAPI(&toImpl(itemRef)->children().leakRef());
}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -95,7 +95,7 @@
WKArrayRef WKBundleFrameCopyChildFrames(WKBundleFrameRef frameRef)
{
- return toAPI(toImpl(frameRef)->childFrames().leakRef());
+ return toAPI(&toImpl(frameRef)->childFrames().leakRef());
}
JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frameRef)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -524,7 +524,7 @@
WKArrayRef WKBundlePageCopyTrackedRepaintRects(WKBundlePageRef pageRef)
{
- return toAPI(toImpl(pageRef)->trackedRepaintRects().leakRef());
+ return toAPI(&toImpl(pageRef)->trackedRepaintRects().leakRef());
}
void WKBundlePageSetComposition(WKBundlePageRef pageRef, WKStringRef text, int from, int length)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -32,7 +32,7 @@
namespace WebKit {
-PassRefPtr<API::Array> InjectedBundleBackForwardListItem::children() const
+Ref<API::Array> InjectedBundleBackForwardListItem::children() const
{
Vector<RefPtr<API::Object>> children;
children.reserveInitialCapacity(m_item->children().size());
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h 2015-04-22 15:28:16 UTC (rev 183105)
@@ -57,7 +57,7 @@
bool isInPageCache() const { return m_item->isInPageCache(); }
bool hasCachedPageExpired() const { return m_item->hasCachedPageExpired(); }
- PassRefPtr<API::Array> children() const;
+ Ref<API::Array> children() const;
private:
InjectedBundleBackForwardListItem(PassRefPtr<WebCore::HistoryItem> item) : m_item(item) { }
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -60,7 +60,7 @@
WKArrayRef newMenuWK = nullptr;
WKTypeRef userDataToPass = nullptr;
- m_client.getContextMenuFromDefaultMenu(toAPI(&page), toAPI(InjectedBundleHitTestResult::create(hitTestResult).get()), toAPI(API::Array::create(WTF::move(defaultMenuItems)).get()), &newMenuWK, &userDataToPass, m_client.base.clientInfo);
+ m_client.getContextMenuFromDefaultMenu(toAPI(&page), toAPI(InjectedBundleHitTestResult::create(hitTestResult).get()), toAPI(API::Array::create(WTF::move(defaultMenuItems)).ptr()), &newMenuWK, &userDataToPass, m_client.base.clientInfo);
RefPtr<API::Array> array = adoptRef(toImpl(newMenuWK));
userData = adoptRef(toImpl(userDataToPass));
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -169,7 +169,7 @@
for (const auto& element : elements)
elementHandles.uncheckedAppend(InjectedBundleNodeHandle::getOrCreate(element.get()));
- m_client.didAssociateFormControls(toAPI(page), toAPI(API::Array::create(WTF::move(elementHandles)).get()), m_client.base.clientInfo);
+ m_client.didAssociateFormControls(toAPI(page), toAPI(API::Array::create(WTF::move(elementHandles)).ptr()), m_client.base.clientInfo);
}
bool InjectedBundlePageFormClient::shouldNotifyOnFormChanges(WebPage* page)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -346,7 +346,7 @@
if (!m_client.featuresUsedInPage)
return;
- return m_client.featuresUsedInPage(toAPI(page), toAPI(API::Array::createStringArray(features).get()), m_client.base.clientInfo);
+ return m_client.featuresUsedInPage(toAPI(page), toAPI(API::Array::createStringArray(features).ptr()), m_client.base.clientInfo);
}
API::String* InjectedBundlePageLoaderClient::userAgentForURL(WebFrame* frame, API::URL* url) const
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -106,7 +106,7 @@
WebFrame* largestSoFar = 0;
- RefPtr<API::Array> frameChildren = mainFrame->childFrames();
+ Ref<API::Array> frameChildren = mainFrame->childFrames();
size_t count = frameChildren->size();
for (size_t i = 0; i < count; ++i) {
WebFrame* childFrame = frameChildren->at<WebFrame>(i);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -445,7 +445,7 @@
return WebFrame::fromCoreFrame(*m_coreFrame->ownerElement()->document().frame());
}
-PassRefPtr<API::Array> WebFrame::childFrames()
+Ref<API::Array> WebFrame::childFrames()
{
if (!m_coreFrame)
return API::Array::create();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2015-04-22 15:28:16 UTC (rev 183105)
@@ -98,7 +98,7 @@
String innerText() const;
bool isFrameSet() const;
WebFrame* parentFrame() const;
- PassRefPtr<API::Array> childFrames();
+ Ref<API::Array> childFrames();
JSGlobalContextRef jsContext();
JSGlobalContextRef jsContextForWorld(InjectedBundleScriptWorld*);
WebCore::IntRect contentBounds() const;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-04-22 15:28:16 UTC (rev 183105)
@@ -810,7 +810,7 @@
view->resetTrackedRepaints();
}
-PassRefPtr<API::Array> WebPage::trackedRepaintRects()
+Ref<API::Array> WebPage::trackedRepaintRects()
{
FrameView* view = mainFrameView();
if (!view)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (183104 => 183105)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-04-22 15:25:37 UTC (rev 183104)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-04-22 15:28:16 UTC (rev 183105)
@@ -338,7 +338,7 @@
void setTracksRepaints(bool);
bool isTrackingRepaints() const;
void resetTrackedRepaints();
- PassRefPtr<API::Array> trackedRepaintRects();
+ Ref<API::Array> trackedRepaintRects();
void executeEditingCommand(const String& commandName, const String& argument);
bool isEditingCommandEnabled(const String& commandName);
