[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 12:24:39 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6151243776d540736dd1c0fbe97a3fa8c589e13a
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Aug 22 01:58:28 2010 +0000
Remove specialized retain/release functions in favor of a single one for WKTypeRefs
https://bugs.webkit.org/show_bug.cgi?id=44386
Reviewed by Dan Bernstein.
WebKit2:
* UIProcess/API/C/WKArray.cpp:
(WKArrayGetSize):
* UIProcess/API/C/WKArray.h:
* UIProcess/API/C/WKBackForwardList.cpp:
(WKBackForwardListCopyForwardListWithLimit):
* UIProcess/API/C/WKBackForwardList.h:
* UIProcess/API/C/WKBackForwardListItem.cpp:
(WKBackForwardListItemCopyTitle):
* UIProcess/API/C/WKBackForwardListItem.h:
* UIProcess/API/C/WKBase.h:
* UIProcess/API/C/WKContext.cpp:
* UIProcess/API/C/WKContext.h:
* UIProcess/API/C/WKData.cpp:
(WKDataGetSize):
* UIProcess/API/C/WKData.h:
* UIProcess/API/C/WKDictionary.cpp:
(WKDictionaryCopyKeys):
* UIProcess/API/C/WKDictionary.h:
* UIProcess/API/C/WKError.h:
* UIProcess/API/C/WKFormSubmissionListener.cpp:
(WKFormSubmissionListenerContinue):
* UIProcess/API/C/WKFormSubmissionListener.h:
* UIProcess/API/C/WKFrame.cpp:
(WKFrameGetPage):
* UIProcess/API/C/WKFrame.h:
* UIProcess/API/C/WKFramePolicyListener.cpp:
(WKFramePolicyListenerIgnore):
* UIProcess/API/C/WKFramePolicyListener.h:
* UIProcess/API/C/WKNavigationData.cpp:
(WKNavigationDataCopyURL):
* UIProcess/API/C/WKNavigationData.h:
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/C/WKPage.h:
* UIProcess/API/C/WKPageNamespace.cpp:
(WKPageNamespaceGetContext):
* UIProcess/API/C/WKPageNamespace.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesCreate):
(WKPreferencesGetLocalStorageEnabled):
* UIProcess/API/C/WKPreferences.h:
* UIProcess/API/C/WKString.cpp:
* UIProcess/API/C/WKString.h:
* UIProcess/API/C/WKType.cpp:
(WKRetain):
(WKRelease):
* UIProcess/API/C/WKType.h:
* UIProcess/API/C/WKURL.cpp:
(WKURLGetTypeID):
* UIProcess/API/C/WKURL.h:
* UIProcess/API/cpp/WKRetainPtr.h:
* UIProcess/API/win/WKView.cpp:
* UIProcess/API/win/WKView.h:
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::shared):
* WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp:
(WKBundleNodeHandleGetTypeID):
* WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h:
* WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp:
(WKBundleScriptWorldNormalWorld):
* WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h:
WebKitTools:
* MiniBrowser/mac/AppDelegate.m:
(didRecieveMessageFromInjectedBundle):
(didNavigateWithNavigationData):
(-[BrowserAppDelegate init]):
(-[BrowserAppDelegate applicationWillTerminate:]):
* MiniBrowser/mac/BrowserStatisticsWindowController.m:
(-[BrowserStatisticsWindowController initWithThreadedWKContextRef:processWKContextRef:]):
(-[BrowserStatisticsWindowController dealloc]):
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController initWithPageNamespace:]):
(-[BrowserWindowController fetch:]):
(-[BrowserWindowController windowWillClose:]):
(-[BrowserWindowController applicationTerminating]):
(closePage):
(runJavaScriptAlert):
(runJavaScriptConfirm):
(runJavaScriptPrompt):
(-[BrowserWindowController updateProvisionalURLForFrame:]):
* MiniBrowser/mac/WebBundle/WebBundleMain.m:
(didClearWindowObjectForFrame):
* MiniBrowser/win/BrowserView.cpp:
(BrowserView::goToURL):
* WebKitTestRunner/win/PlatformWebViewWin.cpp:
(WTR::PlatformWebView::~PlatformWebView):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65780 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 515cd70..73fa533 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,71 @@
+2010-08-21 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Dan Bernstein.
+
+ Remove specialized retain/release functions in favor of a single one for WKTypeRefs
+ https://bugs.webkit.org/show_bug.cgi?id=44386
+
+ * UIProcess/API/C/WKArray.cpp:
+ (WKArrayGetSize):
+ * UIProcess/API/C/WKArray.h:
+ * UIProcess/API/C/WKBackForwardList.cpp:
+ (WKBackForwardListCopyForwardListWithLimit):
+ * UIProcess/API/C/WKBackForwardList.h:
+ * UIProcess/API/C/WKBackForwardListItem.cpp:
+ (WKBackForwardListItemCopyTitle):
+ * UIProcess/API/C/WKBackForwardListItem.h:
+ * UIProcess/API/C/WKBase.h:
+ * UIProcess/API/C/WKContext.cpp:
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/API/C/WKData.cpp:
+ (WKDataGetSize):
+ * UIProcess/API/C/WKData.h:
+ * UIProcess/API/C/WKDictionary.cpp:
+ (WKDictionaryCopyKeys):
+ * UIProcess/API/C/WKDictionary.h:
+ * UIProcess/API/C/WKError.h:
+ * UIProcess/API/C/WKFormSubmissionListener.cpp:
+ (WKFormSubmissionListenerContinue):
+ * UIProcess/API/C/WKFormSubmissionListener.h:
+ * UIProcess/API/C/WKFrame.cpp:
+ (WKFrameGetPage):
+ * UIProcess/API/C/WKFrame.h:
+ * UIProcess/API/C/WKFramePolicyListener.cpp:
+ (WKFramePolicyListenerIgnore):
+ * UIProcess/API/C/WKFramePolicyListener.h:
+ * UIProcess/API/C/WKNavigationData.cpp:
+ (WKNavigationDataCopyURL):
+ * UIProcess/API/C/WKNavigationData.h:
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/API/C/WKPageNamespace.cpp:
+ (WKPageNamespaceGetContext):
+ * UIProcess/API/C/WKPageNamespace.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesCreate):
+ (WKPreferencesGetLocalStorageEnabled):
+ * UIProcess/API/C/WKPreferences.h:
+ * UIProcess/API/C/WKString.cpp:
+ * UIProcess/API/C/WKString.h:
+ * UIProcess/API/C/WKType.cpp:
+ (WKRetain):
+ (WKRelease):
+ * UIProcess/API/C/WKType.h:
+ * UIProcess/API/C/WKURL.cpp:
+ (WKURLGetTypeID):
+ * UIProcess/API/C/WKURL.h:
+ * UIProcess/API/cpp/WKRetainPtr.h:
+ * UIProcess/API/win/WKView.cpp:
+ * UIProcess/API/win/WKView.h:
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::shared):
+ * WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp:
+ (WKBundleNodeHandleGetTypeID):
+ * WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h:
+ * WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp:
+ (WKBundleScriptWorldNormalWorld):
+ * WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h:
+
2010-08-20 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Antonio Gomes.
diff --git a/WebKit2/UIProcess/API/C/WKArray.cpp b/WebKit2/UIProcess/API/C/WKArray.cpp
index 21f183e..c0900ad 100644
--- a/WebKit2/UIProcess/API/C/WKArray.cpp
+++ b/WebKit2/UIProcess/API/C/WKArray.cpp
@@ -56,14 +56,3 @@ size_t WKArrayGetSize(WKArrayRef arrayRef)
{
return toWK(arrayRef)->size();
}
-
-WKArrayRef WKArrayRetain(WKArrayRef arrayRef)
-{
- toWK(arrayRef)->ref();
- return arrayRef;
-}
-
-void WKArrayRelease(WKArrayRef arrayRef)
-{
- toWK(arrayRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKArray.h b/WebKit2/UIProcess/API/C/WKArray.h
index 7827233..25900f3 100644
--- a/WebKit2/UIProcess/API/C/WKArray.h
+++ b/WebKit2/UIProcess/API/C/WKArray.h
@@ -42,13 +42,8 @@ WK_EXPORT WKArrayRef WKArrayCreateAdoptingValues(WKTypeRef* values, size_t numbe
WK_EXPORT WKTypeRef WKArrayGetItemAtIndex(WKArrayRef array, size_t index);
WK_EXPORT size_t WKArrayGetSize(WKArrayRef array);
-WK_EXPORT WKArrayRef WKArrayRetain(WKArrayRef array);
-WK_EXPORT void WKArrayRelease(WKArrayRef array);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKArray)
-
#endif // WKArray_h
diff --git a/WebKit2/UIProcess/API/C/WKBackForwardList.cpp b/WebKit2/UIProcess/API/C/WKBackForwardList.cpp
index a55796e..c0736bd 100644
--- a/WebKit2/UIProcess/API/C/WKBackForwardList.cpp
+++ b/WebKit2/UIProcess/API/C/WKBackForwardList.cpp
@@ -69,14 +69,3 @@ WKArrayRef WKBackForwardListCopyForwardListWithLimit(WKBackForwardListRef listRe
{
return toRef(toWK(listRef)->forwardListAsImmutableArrayWithLimit(limit).releaseRef());
}
-
-WKBackForwardListRef WKBackForwardListRetain(WKBackForwardListRef listRef)
-{
- toWK(listRef)->ref();
- return listRef;
-}
-
-void WKBackForwardListRelease(WKBackForwardListRef listRef)
-{
- toWK(listRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKBackForwardList.h b/WebKit2/UIProcess/API/C/WKBackForwardList.h
index 45a4153..d408d49 100644
--- a/WebKit2/UIProcess/API/C/WKBackForwardList.h
+++ b/WebKit2/UIProcess/API/C/WKBackForwardList.h
@@ -44,13 +44,8 @@ WK_EXPORT unsigned WKBackForwardListGetForwardListCount(WKBackForwardListRef lis
WK_EXPORT WKArrayRef WKBackForwardListCopyBackListWithLimit(WKBackForwardListRef list, unsigned limit);
WK_EXPORT WKArrayRef WKBackForwardListCopyForwardListWithLimit(WKBackForwardListRef list, unsigned limit);
-WK_EXPORT WKBackForwardListRef WKBackForwardListRetain(WKBackForwardListRef list);
-WK_EXPORT void WKBackForwardListRelease(WKBackForwardListRef list);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKBackForwardList)
-
#endif // WKBackForwardList_h
diff --git a/WebKit2/UIProcess/API/C/WKBackForwardListItem.cpp b/WebKit2/UIProcess/API/C/WKBackForwardListItem.cpp
index bd53e78..28fdb71 100644
--- a/WebKit2/UIProcess/API/C/WKBackForwardListItem.cpp
+++ b/WebKit2/UIProcess/API/C/WKBackForwardListItem.cpp
@@ -49,14 +49,3 @@ WKStringRef WKBackForwardListItemCopyTitle(WKBackForwardListItemRef itemRef)
{
return toCopiedRef(toWK(itemRef)->title());
}
-
-WKBackForwardListItemRef WKBackForwardListItemRetain(WKBackForwardListItemRef itemRef)
-{
- toWK(itemRef)->ref();
- return itemRef;
-}
-
-void WKBackForwardListItemRelease(WKBackForwardListItemRef itemRef)
-{
- toWK(itemRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKBackForwardListItem.h b/WebKit2/UIProcess/API/C/WKBackForwardListItem.h
index c37b889..4d665b4 100644
--- a/WebKit2/UIProcess/API/C/WKBackForwardListItem.h
+++ b/WebKit2/UIProcess/API/C/WKBackForwardListItem.h
@@ -38,13 +38,8 @@ WK_EXPORT WKURLRef WKBackForwardListItemCopyOriginalURL(WKBackForwardListItemRef
WK_EXPORT WKURLRef WKBackForwardListItemCopyURL(WKBackForwardListItemRef item);
WK_EXPORT WKStringRef WKBackForwardListItemCopyTitle(WKBackForwardListItemRef item);
-WK_EXPORT WKBackForwardListItemRef WKBackForwardListItemRetain(WKBackForwardListItemRef item);
-WK_EXPORT void WKBackForwardListItemRelease(WKBackForwardListItemRef item);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKBackForwardListItem)
-
#endif /* WKBackForwardListItem_h */
diff --git a/WebKit2/UIProcess/API/C/WKBase.h b/WebKit2/UIProcess/API/C/WKBase.h
index 800cca9..81948ee 100644
--- a/WebKit2/UIProcess/API/C/WKBase.h
+++ b/WebKit2/UIProcess/API/C/WKBase.h
@@ -67,14 +67,4 @@ typedef struct OpaqueWKURL* WKURLRef;
#define WK_EXPORT
#endif
-#ifdef __cplusplus
-#define WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKType) \
- inline void WKRetain(WKType##Ref p) { WKType##Retain(p); } \
- inline void WKRelease(WKType##Ref p) { WKType##Release(p); } \
- // end of macro
-#else
-#define WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKType)
-#endif
-
-
#endif /* WKBase_h */
diff --git a/WebKit2/UIProcess/API/C/WKContext.cpp b/WebKit2/UIProcess/API/C/WKContext.cpp
index 745036b..324e1b0 100644
--- a/WebKit2/UIProcess/API/C/WKContext.cpp
+++ b/WebKit2/UIProcess/API/C/WKContext.cpp
@@ -99,17 +99,6 @@ void WKContextAddVisitedLink(WKContextRef contextRef, WKStringRef visitedURL)
toWK(contextRef)->addVisitedLink(toWK(visitedURL)->string());
}
-WKContextRef WKContextRetain(WKContextRef contextRef)
-{
- toWK(contextRef)->ref();
- return contextRef;
-}
-
-void WKContextRelease(WKContextRef contextRef)
-{
- toWK(contextRef)->deref();
-}
-
void _WKContextSetAdditionalPluginsDirectory(WKContextRef contextRef, WKStringRef pluginsDirectory)
{
toWK(contextRef)->setAdditionalPluginsDirectory(toWK(pluginsDirectory)->string());
diff --git a/WebKit2/UIProcess/API/C/WKContext.h b/WebKit2/UIProcess/API/C/WKContext.h
index b680976..cb59cc6 100644
--- a/WebKit2/UIProcess/API/C/WKContext.h
+++ b/WebKit2/UIProcess/API/C/WKContext.h
@@ -76,13 +76,8 @@ WK_EXPORT void WKContextPostMessageToInjectedBundle(WKContextRef context, WKStri
WK_EXPORT void WKContextAddVisitedLink(WKContextRef context, WKStringRef visitedURL);
-WK_EXPORT WKContextRef WKContextRetain(WKContextRef context);
-WK_EXPORT void WKContextRelease(WKContextRef context);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKContext)
-
#endif /* WKContext_h */
diff --git a/WebKit2/UIProcess/API/C/WKData.cpp b/WebKit2/UIProcess/API/C/WKData.cpp
index 08d8371..1196a55 100644
--- a/WebKit2/UIProcess/API/C/WKData.cpp
+++ b/WebKit2/UIProcess/API/C/WKData.cpp
@@ -50,14 +50,3 @@ size_t WKDataGetSize(WKDataRef dataRef)
{
return toWK(dataRef)->size();
}
-
-WKDataRef WKDataRetain(WKDataRef dataRef)
-{
- toWK(dataRef)->ref();
- return dataRef;
-}
-
-void WKDataRelease(WKDataRef dataRef)
-{
- toWK(dataRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKData.h b/WebKit2/UIProcess/API/C/WKData.h
index 997ccd1..a647ee4 100644
--- a/WebKit2/UIProcess/API/C/WKData.h
+++ b/WebKit2/UIProcess/API/C/WKData.h
@@ -41,13 +41,8 @@ WK_EXPORT WKDataRef WKDataCreate(const unsigned char* bytes, size_t size);
WK_EXPORT const unsigned char* WKDataGetBytes(WKDataRef data);
WK_EXPORT size_t WKDataGetSize(WKDataRef data);
-WK_EXPORT WKDataRef WKDataRetain(WKDataRef data);
-WK_EXPORT void WKDataRelease(WKDataRef data);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKData)
-
#endif // WKData_h
diff --git a/WebKit2/UIProcess/API/C/WKDictionary.cpp b/WebKit2/UIProcess/API/C/WKDictionary.cpp
index 31859bb..180729d 100644
--- a/WebKit2/UIProcess/API/C/WKDictionary.cpp
+++ b/WebKit2/UIProcess/API/C/WKDictionary.cpp
@@ -51,14 +51,3 @@ WKArrayRef WKDictionaryCopyKeys(WKDictionaryRef dictionaryRef)
RefPtr<ImmutableArray> keys = toWK(dictionaryRef)->keys();
return toRef(keys.release().releaseRef());
}
-
-WKDictionaryRef WKDictionaryRetain(WKDictionaryRef dictionaryRef)
-{
- toWK(dictionaryRef)->ref();
- return dictionaryRef;
-}
-
-void WKDictionaryRelease(WKDictionaryRef dictionaryRef)
-{
- toWK(dictionaryRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKDictionary.h b/WebKit2/UIProcess/API/C/WKDictionary.h
index 5449062..1c39400 100644
--- a/WebKit2/UIProcess/API/C/WKDictionary.h
+++ b/WebKit2/UIProcess/API/C/WKDictionary.h
@@ -41,13 +41,8 @@ WK_EXPORT size_t WKDictionaryGetSize(WKDictionaryRef dictionary);
WK_EXPORT WKArrayRef WKDictionaryCopyKeys(WKDictionaryRef dictionary);
-WK_EXPORT WKDictionaryRef WKDictionaryRetain(WKDictionaryRef dictionary);
-WK_EXPORT void WKDictionaryRelease(WKDictionaryRef dictionary);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKDictionary)
-
#endif /* WKDictionary_h */
diff --git a/WebKit2/UIProcess/API/C/WKError.h b/WebKit2/UIProcess/API/C/WKError.h
index 14029f6..4c9403c 100644
--- a/WebKit2/UIProcess/API/C/WKError.h
+++ b/WebKit2/UIProcess/API/C/WKError.h
@@ -34,13 +34,8 @@ extern "C" {
WK_EXPORT WKTypeID WKErrorGetTypeID();
-WK_EXPORT WKErrorRef WKErrorRetain(WKErrorRef error);
-WK_EXPORT void WKErrorRelease(WKErrorRef error);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKError)
-
#endif // WKError_h
diff --git a/WebKit2/UIProcess/API/C/WKFormSubmissionListener.cpp b/WebKit2/UIProcess/API/C/WKFormSubmissionListener.cpp
index ef3de2a..8b74188 100644
--- a/WebKit2/UIProcess/API/C/WKFormSubmissionListener.cpp
+++ b/WebKit2/UIProcess/API/C/WKFormSubmissionListener.cpp
@@ -39,14 +39,3 @@ void WKFormSubmissionListenerContinue(WKFormSubmissionListenerRef submissionList
{
toWK(submissionListener)->continueSubmission();
}
-
-WKFormSubmissionListenerRef WKFormSubmissionListenerRetain(WKFormSubmissionListenerRef submissionListenerRef)
-{
- toWK(submissionListenerRef)->ref();
- return submissionListenerRef;
-}
-
-void WKFormSubmissionListenerRelease(WKFormSubmissionListenerRef submissionListenerRef)
-{
- toWK(submissionListenerRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKFormSubmissionListener.h b/WebKit2/UIProcess/API/C/WKFormSubmissionListener.h
index 7b9ea67..4b9b79a 100644
--- a/WebKit2/UIProcess/API/C/WKFormSubmissionListener.h
+++ b/WebKit2/UIProcess/API/C/WKFormSubmissionListener.h
@@ -36,13 +36,8 @@ WK_EXPORT WKTypeID WKFormSubmissionListenerGetTypeID();
WK_EXPORT void WKFormSubmissionListenerContinue(WKFormSubmissionListenerRef submissionListener);
-WK_EXPORT WKFormSubmissionListenerRef WKFormSubmissionListenerRetain(WKFormSubmissionListenerRef submissionListener);
-WK_EXPORT void WKFormSubmissionListenerRelease(WKFormSubmissionListenerRef submissionListener);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKFormSubmissionListener)
-
#endif /* WKFormSubmissionListener_h */
diff --git a/WebKit2/UIProcess/API/C/WKFrame.cpp b/WebKit2/UIProcess/API/C/WKFrame.cpp
index 9924e03..c4504e7 100644
--- a/WebKit2/UIProcess/API/C/WKFrame.cpp
+++ b/WebKit2/UIProcess/API/C/WKFrame.cpp
@@ -70,14 +70,3 @@ WKPageRef WKFrameGetPage(WKFrameRef frameRef)
{
return toRef(toWK(frameRef)->page());
}
-
-WKFrameRef WKFrameRetain(WKFrameRef frameRef)
-{
- toWK(frameRef)->ref();
- return frameRef;
-}
-
-void WKFrameRelease(WKFrameRef frameRef)
-{
- toWK(frameRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKFrame.h b/WebKit2/UIProcess/API/C/WKFrame.h
index 3da22ca..aa0180a 100644
--- a/WebKit2/UIProcess/API/C/WKFrame.h
+++ b/WebKit2/UIProcess/API/C/WKFrame.h
@@ -52,13 +52,8 @@ WK_EXPORT WKURLRef WKFrameCopyURL(WKFrameRef frame);
WK_EXPORT WKPageRef WKFrameGetPage(WKFrameRef frame);
-WK_EXPORT WKFrameRef WKFrameRetain(WKFrameRef frame);
-WK_EXPORT void WKFrameRelease(WKFrameRef frame);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKFrame)
-
#endif /* WKFrame_h */
diff --git a/WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp b/WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp
index e3200ce..2c781d9 100644
--- a/WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp
+++ b/WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp
@@ -50,14 +50,3 @@ void WKFramePolicyListenerIgnore(WKFramePolicyListenerRef policyListenerRef)
{
toWK(policyListenerRef)->ignore();
}
-
-WKFramePolicyListenerRef WKFramePolicyListenerRetain(WKFramePolicyListenerRef policyListenerRef)
-{
- toWK(policyListenerRef)->ref();
- return policyListenerRef;
-}
-
-void WKFramePolicyListenerRelease(WKFramePolicyListenerRef policyListenerRef)
-{
- toWK(policyListenerRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKFramePolicyListener.h b/WebKit2/UIProcess/API/C/WKFramePolicyListener.h
index 32295c6..99b013d 100644
--- a/WebKit2/UIProcess/API/C/WKFramePolicyListener.h
+++ b/WebKit2/UIProcess/API/C/WKFramePolicyListener.h
@@ -38,13 +38,8 @@ WK_EXPORT void WKFramePolicyListenerUse(WKFramePolicyListenerRef policyListener)
WK_EXPORT void WKFramePolicyListenerDownload(WKFramePolicyListenerRef policyListener);
WK_EXPORT void WKFramePolicyListenerIgnore(WKFramePolicyListenerRef policyListener);
-WK_EXPORT WKFramePolicyListenerRef WKFramePolicyListenerRetain(WKFramePolicyListenerRef policyListener);
-WK_EXPORT void WKFramePolicyListenerRelease(WKFramePolicyListenerRef policyListener);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKFramePolicyListener)
-
#endif /* WKFramePolicyListener_h */
diff --git a/WebKit2/UIProcess/API/C/WKNavigationData.cpp b/WebKit2/UIProcess/API/C/WKNavigationData.cpp
index e483d87..a71d4cb 100644
--- a/WebKit2/UIProcess/API/C/WKNavigationData.cpp
+++ b/WebKit2/UIProcess/API/C/WKNavigationData.cpp
@@ -44,14 +44,3 @@ WKURLRef WKNavigationDataCopyURL(WKNavigationDataRef navigationDataRef)
{
return toCopiedURLRef(toWK(navigationDataRef)->url());
}
-
-WKNavigationDataRef WKNavigationDataRetain(WKNavigationDataRef navigationDataRef)
-{
- toWK(navigationDataRef)->ref();
- return navigationDataRef;
-}
-
-void WKNavigationDataRelease(WKNavigationDataRef navigationDataRef)
-{
- toWK(navigationDataRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKNavigationData.h b/WebKit2/UIProcess/API/C/WKNavigationData.h
index b35a260..c855b54 100644
--- a/WebKit2/UIProcess/API/C/WKNavigationData.h
+++ b/WebKit2/UIProcess/API/C/WKNavigationData.h
@@ -37,13 +37,8 @@ WK_EXPORT WKTypeID WKNavigationDataGetTypeID();
WK_EXPORT WKStringRef WKNavigationDataCopyTitle(WKNavigationDataRef navigationData);
WK_EXPORT WKURLRef WKNavigationDataCopyURL(WKNavigationDataRef navigationData);
-WK_EXPORT WKNavigationDataRef WKNavigationDataRetain(WKNavigationDataRef navigationData);
-WK_EXPORT void WKNavigationDataRelease(WKNavigationDataRef navigationData);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKNavigationData)
-
#endif /* WKNavigationData_h */
diff --git a/WebKit2/UIProcess/API/C/WKPage.cpp b/WebKit2/UIProcess/API/C/WKPage.cpp
index decb9b8..99e1aea 100644
--- a/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -209,14 +209,3 @@ void WKPageRenderTreeExternalRepresentation_b(WKPageRef pageRef, WKPageRenderTre
WKPageRenderTreeExternalRepresentation(pageRef, Block_copy(block), callRenderTreeExternalRepresentationBlockAndDispose);
}
#endif
-
-WKPageRef WKPageRetain(WKPageRef pageRef)
-{
- toWK(pageRef)->ref();
- return pageRef;
-}
-
-void WKPageRelease(WKPageRef pageRef)
-{
- toWK(pageRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index 5a3b835..184443e 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -197,14 +197,8 @@ typedef void (^WKPageRunJavaScriptBlock)(WKStringRef, WKErrorRef);
WK_EXPORT void WKPageRunJavaScriptInMainFrame_b(WKPageRef page, WKStringRef script, WKPageRunJavaScriptBlock block);
#endif
-
-WK_EXPORT WKPageRef WKPageRetain(WKPageRef page);
-WK_EXPORT void WKPageRelease(WKPageRef page);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKPage)
-
#endif /* WKPage_h */
diff --git a/WebKit2/UIProcess/API/C/WKPageNamespace.cpp b/WebKit2/UIProcess/API/C/WKPageNamespace.cpp
index 03f8ddd..c5e21fe 100644
--- a/WebKit2/UIProcess/API/C/WKPageNamespace.cpp
+++ b/WebKit2/UIProcess/API/C/WKPageNamespace.cpp
@@ -46,14 +46,3 @@ WKContextRef WKPageNamespaceGetContext(WKPageNamespaceRef pageNamespaceRef)
{
return toRef(toWK(pageNamespaceRef)->context());
}
-
-WKPageNamespaceRef WKPageNamespaceRetain(WKPageNamespaceRef pageNamespaceRef)
-{
- toWK(pageNamespaceRef)->ref();
- return pageNamespaceRef;
-}
-
-void WKPageNamespaceRelease(WKPageNamespaceRef pageNamespaceRef)
-{
- toWK(pageNamespaceRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKPageNamespace.h b/WebKit2/UIProcess/API/C/WKPageNamespace.h
index f83f7dd..b348c76 100644
--- a/WebKit2/UIProcess/API/C/WKPageNamespace.h
+++ b/WebKit2/UIProcess/API/C/WKPageNamespace.h
@@ -38,13 +38,8 @@ WK_EXPORT WKPageNamespaceRef WKPageNamespaceCreate(WKContextRef ownerContext);
WK_EXPORT WKContextRef WKPageNamespaceGetContext(WKPageNamespaceRef pageNamespace);
-WK_EXPORT WKPageNamespaceRef WKPageNamespaceRetain(WKPageNamespaceRef pageNamespace);
-WK_EXPORT void WKPageNamespaceRelease(WKPageNamespaceRef pageNamespace);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKPageNamespace)
-
#endif /* WKPageNamespace_h */
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index 7be3252..6aa19ab 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -40,7 +40,7 @@ WKTypeID WKPreferencesGetTypeID()
WKPreferencesRef WKPreferencesCreate()
{
RefPtr<WebPreferences> preferences = WebPreferences::create();
- return toRef(preferences.release().releaseRef());
+ return toRef(preferences.release().leakRef());
}
WKPreferencesRef WKPreferencesCreateCopy(WKPreferencesRef preferencesRef)
@@ -88,14 +88,3 @@ bool WKPreferencesGetLocalStorageEnabled(WKPreferencesRef preferencesRef)
{
return toWK(preferencesRef)->localStorageEnabled();
}
-
-WKPreferencesRef WKPreferencesRetain(WKPreferencesRef preferencesRef)
-{
- toWK(preferencesRef)->ref();
- return preferencesRef;
-}
-
-void WKPreferencesRelease(WKPreferencesRef preferencesRef)
-{
- toWK(preferencesRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.h b/WebKit2/UIProcess/API/C/WKPreferences.h
index fbde917..7c453f2 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -57,13 +57,8 @@ WK_EXPORT bool WKPreferencesGetOfflineWebApplicationCacheEnabled(WKPreferencesRe
WK_EXPORT void WKPreferencesSetLocalStorageEnabled(WKPreferencesRef preferences, bool localStorageEnabled);
WK_EXPORT bool WKPreferencesGetLocalStorageEnabled(WKPreferencesRef preferences);
-WK_EXPORT WKPreferencesRef WKPreferencesRetain(WKPreferencesRef preferences);
-WK_EXPORT void WKPreferencesRelease(WKPreferencesRef preferences);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKPreferences)
-
#endif /* WKPreferences_h */
diff --git a/WebKit2/UIProcess/API/C/WKString.cpp b/WebKit2/UIProcess/API/C/WKString.cpp
index de76bb0..88cd0ce 100644
--- a/WebKit2/UIProcess/API/C/WKString.cpp
+++ b/WebKit2/UIProcess/API/C/WKString.cpp
@@ -34,17 +34,6 @@ WKTypeID WKStringGetTypeID()
return toRef(WebString::APIType);
}
-WKStringRef WKStringRetain(WKStringRef stringRef)
-{
- toWK(stringRef)->ref();
- return stringRef;
-}
-
-void WKStringRelease(WKStringRef stringRef)
-{
- toWK(stringRef)->deref();
-}
-
bool WKStringIsEmpty(WKStringRef stringRef)
{
return toWK(stringRef)->isEmpty();
diff --git a/WebKit2/UIProcess/API/C/WKString.h b/WebKit2/UIProcess/API/C/WKString.h
index dab854f..6cdc9f1 100644
--- a/WebKit2/UIProcess/API/C/WKString.h
+++ b/WebKit2/UIProcess/API/C/WKString.h
@@ -38,15 +38,10 @@ extern "C" {
WK_EXPORT WKTypeID WKStringGetTypeID();
-WK_EXPORT WKStringRef WKStringRetain(WKStringRef string);
-WK_EXPORT void WKStringRelease(WKStringRef string);
-
WK_EXPORT bool WKStringIsEmpty(WKStringRef string);
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKString)
-
#endif /* WKString_h */
diff --git a/WebKit2/UIProcess/API/C/WKType.cpp b/WebKit2/UIProcess/API/C/WKType.cpp
index a53a735..16abbe3 100644
--- a/WebKit2/UIProcess/API/C/WKType.cpp
+++ b/WebKit2/UIProcess/API/C/WKType.cpp
@@ -34,3 +34,14 @@ WKTypeID WKGetTypeID(WKTypeRef typeRef)
{
return toRef(static_cast<APIObject*>(typeRef)->type());
}
+
+WKTypeRef WKRetain(WKTypeRef typeRef)
+{
+ static_cast<APIObject*>(typeRef)->ref();
+ return typeRef;
+}
+
+void WKRelease(WKTypeRef typeRef)
+{
+ static_cast<APIObject*>(typeRef)->deref();
+}
diff --git a/WebKit2/UIProcess/API/C/WKType.h b/WebKit2/UIProcess/API/C/WKType.h
index c012f05..02f036c 100644
--- a/WebKit2/UIProcess/API/C/WKType.h
+++ b/WebKit2/UIProcess/API/C/WKType.h
@@ -34,6 +34,9 @@ extern "C" {
WK_EXPORT WKTypeID WKGetTypeID(WKTypeRef type);
+WK_EXPORT WKTypeRef WKRetain(WKTypeRef type);
+WK_EXPORT void WKRelease(WKTypeRef type);
+
#ifdef __cplusplus
}
#endif
diff --git a/WebKit2/UIProcess/API/C/WKURL.cpp b/WebKit2/UIProcess/API/C/WKURL.cpp
index f3da395..b525833 100644
--- a/WebKit2/UIProcess/API/C/WKURL.cpp
+++ b/WebKit2/UIProcess/API/C/WKURL.cpp
@@ -33,14 +33,3 @@ WKTypeID WKURLGetTypeID()
{
return toRef(WebURL::APIType);
}
-
-WKURLRef WKURLRetain(WKURLRef URLRef)
-{
- toWK(URLRef)->ref();
- return URLRef;
-}
-
-void WKURLRelease(WKURLRef URLRef)
-{
- toWK(URLRef)->deref();
-}
diff --git a/WebKit2/UIProcess/API/C/WKURL.h b/WebKit2/UIProcess/API/C/WKURL.h
index b759a66..e12f55c 100644
--- a/WebKit2/UIProcess/API/C/WKURL.h
+++ b/WebKit2/UIProcess/API/C/WKURL.h
@@ -34,13 +34,8 @@ extern "C" {
WK_EXPORT WKTypeID WKURLGetTypeID();
-WK_EXPORT WKURLRef WKURLRetain(WKURLRef URL);
-WK_EXPORT void WKURLRelease(WKURLRef URL);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKURL)
-
#endif /* WKURL_h */
diff --git a/WebKit2/UIProcess/API/cpp/WKRetainPtr.h b/WebKit2/UIProcess/API/cpp/WKRetainPtr.h
index 5616f8d..cb2a63e 100644
--- a/WebKit2/UIProcess/API/cpp/WKRetainPtr.h
+++ b/WebKit2/UIProcess/API/cpp/WKRetainPtr.h
@@ -26,6 +26,7 @@
#ifndef WKRetainPtr_h
#define WKRetainPtr_h
+#include <WebKit2/WKType.h>
#include <algorithm>
namespace WebKit {
@@ -105,9 +106,6 @@ public:
void adopt(PtrType);
void swap(WKRetainPtr&);
- // FIXME: Remove once all callers are calling leakRef.
- PtrType releaseRef() { leakRef(); }
-
private:
PtrType m_ptr;
};
diff --git a/WebKit2/UIProcess/API/win/WKView.cpp b/WebKit2/UIProcess/API/win/WKView.cpp
index ed48eac..60a9df4 100644
--- a/WebKit2/UIProcess/API/win/WKView.cpp
+++ b/WebKit2/UIProcess/API/win/WKView.cpp
@@ -56,17 +56,6 @@ WKPageRef WKViewGetPage(WKViewRef viewRef)
return toRef(toWK(viewRef)->page());
}
-WKViewRef WKViewRetain(WKViewRef viewRef)
-{
- toWK(viewRef)->ref();
- return viewRef;
-}
-
-void WKViewRelease(WKViewRef viewRef)
-{
- toWK(viewRef)->deref();
-}
-
void WKViewSetHostWindow(WKViewRef viewRef, HWND hostWindow)
{
toWK(viewRef)->setHostWindow(hostWindow);
diff --git a/WebKit2/UIProcess/API/win/WKView.h b/WebKit2/UIProcess/API/win/WKView.h
index 2465c32..b40a000 100644
--- a/WebKit2/UIProcess/API/win/WKView.h
+++ b/WebKit2/UIProcess/API/win/WKView.h
@@ -42,9 +42,6 @@ WK_EXPORT HWND WKViewGetHostWindow(WKViewRef view);
WK_EXPORT WKPageRef WKViewGetPage(WKViewRef view);
-WK_EXPORT WKViewRef WKViewRetain(WKViewRef view);
-WK_EXPORT void WKViewRelease(WKViewRef view);
-
WK_EXPORT void WKViewSetHostWindow(WKViewRef view, HWND hostWindow);
WK_EXPORT void WKViewWindowAncestryDidChange(WKViewRef view);
@@ -52,6 +49,4 @@ WK_EXPORT void WKViewWindowAncestryDidChange(WKViewRef view);
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKView)
-
#endif /* WKView_h */
diff --git a/WebKit2/UIProcess/WebPreferences.cpp b/WebKit2/UIProcess/WebPreferences.cpp
index c93c253..110a99f 100644
--- a/WebKit2/UIProcess/WebPreferences.cpp
+++ b/WebKit2/UIProcess/WebPreferences.cpp
@@ -31,7 +31,7 @@ namespace WebKit {
WebPreferences* WebPreferences::shared()
{
- static WebPreferences* sharedPreferences = WebPreferences::create().releaseRef();
+ static WebPreferences* sharedPreferences = WebPreferences::create().leakRef();
return sharedPreferences;
}
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp
index c982850..56738da 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp
@@ -35,14 +35,3 @@ WKTypeID WKBundleNodeHandleGetTypeID()
{
return toRef(InjectedBundleNodeHandle::APIType);
}
-
-WKBundleNodeHandleRef WKBundleNodeHandleRetain(WKBundleNodeHandleRef nodeHandleRef)
-{
- toWK(nodeHandleRef)->ref();
- return nodeHandleRef;
-}
-
-void WKBundleNodeHandleRelease(WKBundleNodeHandleRef nodeHandleRef)
-{
- toWK(nodeHandleRef)->deref();
-}
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
index 9ad2065..401b68e 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h
@@ -36,13 +36,8 @@ extern "C" {
WK_EXPORT WKTypeID WKBundleNodeHandleGetTypeID();
-WK_EXPORT WKBundleNodeHandleRef WKBundleNodeHandleRetain(WKBundleNodeHandleRef nodeHandle);
-WK_EXPORT void WKBundleNodeHandleRelease(WKBundleNodeHandleRef nodeHandle);
-
#ifdef __cplusplus
}
#endif
-WK_DECLARE_RETAIN_RELEASE_OVERLOADS(WKBundleNodeHandle)
-
#endif /* WKBundleNodeHandle_h */
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
index e4eb94c..06171b0 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
@@ -46,14 +46,3 @@ WKBundleScriptWorldRef WKBundleScriptWorldNormalWorld()
{
return toRef(InjectedBundleScriptWorld::normalWorld());
}
-
-WKBundleScriptWorldRef WKBundleScriptWorldRetain(WKBundleScriptWorldRef scriptWorldRef)
-{
- toWK(scriptWorldRef)->ref();
- return scriptWorldRef;
-}
-
-void WKBundleScriptWorldRelease(WKBundleScriptWorldRef scriptWorldRef)
-{
- toWK(scriptWorldRef)->deref();
-}
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
index dd22a00..db23b3d 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
@@ -38,9 +38,6 @@ WK_EXPORT WKTypeID WKBundleScriptWorldGetTypeID();
WK_EXPORT WKBundleScriptWorldRef WKBundleScriptWorldCreateWorld();
WK_EXPORT WKBundleScriptWorldRef WKBundleScriptWorldNormalWorld();
-WK_EXPORT WKBundleScriptWorldRef WKBundleScriptWorldRetain(WKBundleScriptWorldRef scriptWorld);
-WK_EXPORT void WKBundleScriptWorldRelease(WKBundleScriptWorldRef scriptWorld);
-
#ifdef __cplusplus
}
#endif
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3eac860..913d605 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,35 @@
+2010-08-21 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Dan Bernstein.
+
+ Remove specialized retain/release functions in favor of a single one for WKTypeRefs
+ https://bugs.webkit.org/show_bug.cgi?id=44386
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (didRecieveMessageFromInjectedBundle):
+ (didNavigateWithNavigationData):
+ (-[BrowserAppDelegate init]):
+ (-[BrowserAppDelegate applicationWillTerminate:]):
+ * MiniBrowser/mac/BrowserStatisticsWindowController.m:
+ (-[BrowserStatisticsWindowController initWithThreadedWKContextRef:processWKContextRef:]):
+ (-[BrowserStatisticsWindowController dealloc]):
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController initWithPageNamespace:]):
+ (-[BrowserWindowController fetch:]):
+ (-[BrowserWindowController windowWillClose:]):
+ (-[BrowserWindowController applicationTerminating]):
+ (closePage):
+ (runJavaScriptAlert):
+ (runJavaScriptConfirm):
+ (runJavaScriptPrompt):
+ (-[BrowserWindowController updateProvisionalURLForFrame:]):
+ * MiniBrowser/mac/WebBundle/WebBundleMain.m:
+ (didClearWindowObjectForFrame):
+ * MiniBrowser/win/BrowserView.cpp:
+ (BrowserView::goToURL):
+ * WebKitTestRunner/win/PlatformWebViewWin.cpp:
+ (WTR::PlatformWebView::~PlatformWebView):
+
2010-08-20 Benjamin Poulain <benjamin.poulain at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list