[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:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 61287b5f5400bd5ac122626dbeae9ea66ebdc83c
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Aug 22 03:01:50 2010 +0000
Check in missing files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65781 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/MiniBrowser/mac/AppDelegate.m b/WebKitTools/MiniBrowser/mac/AppDelegate.m
index ffb6363..3bd3d57 100644
--- a/WebKitTools/MiniBrowser/mac/AppDelegate.m
+++ b/WebKitTools/MiniBrowser/mac/AppDelegate.m
@@ -56,8 +56,8 @@ void didRecieveMessageFromInjectedBundle(WKContextRef context, WKStringRef messa
WKContextPostMessageToInjectedBundle(context, newMessageName, newMessageBody);
- WKStringRelease(newMessageName);
- WKStringRelease(newMessageBody);
+ WKRelease(newMessageName);
+ WKRelease(newMessageBody);
}
#pragma mark History Client Callbacks
@@ -66,11 +66,11 @@ static void didNavigateWithNavigationData(WKContextRef context, WKPageRef page,
{
WKStringRef wkTitle = WKNavigationDataCopyTitle(navigationData);
CFStringRef title = WKStringCopyCFString(0, wkTitle);
- WKStringRelease(wkTitle);
+ WKRelease(wkTitle);
WKURLRef wkURL = WKNavigationDataCopyURL(navigationData);
CFURLRef url = WKURLCopyCFURL(0, wkURL);
- WKURLRelease(wkURL);
+ WKRelease(wkURL);
LOG(@"HistoryClient - didNavigateWithNavigationData - title: %@ - url: %@", title, url);
CFRelease(title);
@@ -131,7 +131,7 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
WKContextSetHistoryClient(threadContext, &historyClient);
threadPageNamespace = WKPageNamespaceCreate(threadContext);
- WKContextRelease(threadContext);
+ WKRelease(threadContext);
CFStringRef bundlePathCF = (CFStringRef)[[NSBundle mainBundle] pathForAuxiliaryExecutable:@"WebBundle.bundle"];
WKStringRef bundlePath = WKStringCreateWithCFString(bundlePathCF);
@@ -147,9 +147,9 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
WKContextSetHistoryClient(processContext, &historyClient);
processPageNamespace = WKPageNamespaceCreate(processContext);
- WKContextRelease(processContext);
+ WKRelease(processContext);
- WKStringRelease(bundlePath);
+ WKRelease(bundlePath);
}
return self;
@@ -221,10 +221,10 @@ static void populateVisitedLinks(WKContextRef context, const void *clientInfo)
}
}
- WKPageNamespaceRelease(threadPageNamespace);
+ WKRelease(threadPageNamespace);
threadPageNamespace = 0;
- WKPageNamespaceRelease(processPageNamespace);
+ WKRelease(processPageNamespace);
processPageNamespace = 0;
}
diff --git a/WebKitTools/MiniBrowser/mac/BrowserStatisticsWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserStatisticsWindowController.m
index 872fb55..28ddb7a 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserStatisticsWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserStatisticsWindowController.m
@@ -15,8 +15,8 @@
- (id)initWithThreadedWKContextRef:(WKContextRef)threadContext processWKContextRef:(WKContextRef)processContext
{
if ((self = [super initWithWindowNibName:@"BrowserStatisticsWindow"])) {
- _threadContext = WKContextRetain(threadContext);
- _processContext = WKContextRetain(processContext);
+ _threadContext = WKRetain(threadContext);
+ _processContext = WKRetain(processContext);
}
return self;
@@ -24,10 +24,10 @@
- (void)dealloc
{
- WKContextRelease(_threadContext);
+ WKRelease(_threadContext);
_threadContext = 0;
- WKContextRelease(_processContext);
+ WKRelease(_processContext);
_processContext = 0;
[super dealloc];
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index e3eefc5..6422cca 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -45,7 +45,7 @@
- (id)initWithPageNamespace:(WKPageNamespaceRef)pageNamespace
{
if ((self = [super initWithWindowNibName:@"BrowserWindow"]))
- _pageNamespace = WKPageNamespaceRetain(pageNamespace);
+ _pageNamespace = WKRetain(pageNamespace);
return self;
}
@@ -63,7 +63,7 @@
CFRelease(cfURL);
WKPageLoadURL(_webView.pageRef, url);
- WKURLRelease(url);
+ WKRelease(url);
}
- (IBAction)showHideWebView:(id)sender
@@ -140,14 +140,14 @@
- (void)windowWillClose:(NSNotification *)notification
{
- WKPageNamespaceRelease(_pageNamespace);
+ WKRelease(_pageNamespace);
_pageNamespace = 0;
}
- (void)applicationTerminating
{
WKPageClose(_webView.pageRef);
- WKPageRelease(_webView.pageRef);
+ WKRelease(_webView.pageRef);
}
#pragma mark Loader Client Callbacks
@@ -275,7 +275,7 @@ static void closePage(WKPageRef page, const void *clientInfo)
LOG(@"closePage");
WKPageClose(page);
[[(BrowserWindowController *)clientInfo window] close];
- WKPageRelease(page);
+ WKRelease(page);
}
static void runJavaScriptAlert(WKPageRef page, WKStringRef message, WKFrameRef frame, const void* clientInfo)
@@ -284,7 +284,7 @@ static void runJavaScriptAlert(WKPageRef page, WKStringRef message, WKFrameRef f
WKURLRef wkURL = WKFrameCopyURL(frame);
CFURLRef cfURL = WKURLCopyCFURL(0, wkURL);
- WKURLRelease(wkURL);
+ WKRelease(wkURL);
[alert setMessageText:[NSString stringWithFormat:@"JavaScript alert dialog from %@.", [(NSURL *)cfURL absoluteString]]];
CFRelease(cfURL);
@@ -305,7 +305,7 @@ static bool runJavaScriptConfirm(WKPageRef page, WKStringRef message, WKFrameRef
WKURLRef wkURL = WKFrameCopyURL(frame);
CFURLRef cfURL = WKURLCopyCFURL(0, wkURL);
- WKURLRelease(wkURL);
+ WKRelease(wkURL);
[alert setMessageText:[NSString stringWithFormat:@"JavaScript confirm dialog from %@.", [(NSURL *)cfURL absoluteString]]];
CFRelease(cfURL);
@@ -329,7 +329,7 @@ static WKStringRef runJavaScriptPrompt(WKPageRef page, WKStringRef message, WKSt
WKURLRef wkURL = WKFrameCopyURL(frame);
CFURLRef cfURL = WKURLCopyCFURL(0, wkURL);
- WKURLRelease(wkURL);
+ WKRelease(wkURL);
[alert setMessageText:[NSString stringWithFormat:@"JavaScript prompt dialog from %@.", [(NSURL *)cfURL absoluteString]]];
CFRelease(cfURL);
@@ -441,7 +441,7 @@ static WKStringRef runJavaScriptPrompt(WKPageRef page, WKStringRef message, WKSt
return;
CFURLRef cfSourceURL = WKURLCopyCFURL(0, url);
- WKURLRelease(url);
+ WKRelease(url);
[urlText setStringValue:(NSString*)CFURLGetString(cfSourceURL)];
CFRelease(cfSourceURL);
diff --git a/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m b/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m
index 8e0a576..17958c7 100644
--- a/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m
+++ b/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m
@@ -41,7 +41,7 @@ void didClearWindowObjectForFrame(WKBundlePageRef page, WKBundleFrameRef frame,
{
WKURLRef wkURL = WKBundleFrameCopyURL(WKBundlePageGetMainFrame(page));
CFURLRef cfURL = WKURLCopyCFURL(0, wkURL);
- WKURLRelease(wkURL);
+ WKRelease(wkURL);
LOG(@"WKBundlePageClient - didClearWindowForFrame %@", [(NSURL *)cfURL absoluteString]);
CFRelease(cfURL);
@@ -49,8 +49,8 @@ void didClearWindowObjectForFrame(WKBundlePageRef page, WKBundleFrameRef frame,
WKStringRef messageName = WKStringCreateWithCFString(CFSTR("Callback"));
WKStringRef messageBody = WKStringCreateWithCFString(CFSTR("Window was cleared"));
WKBundlePostMessage(globalBundle, messageName, messageBody);
- WKStringRelease(messageName);
- WKStringRelease(messageBody);
+ WKRelease(messageName);
+ WKRelease(messageBody);
}
diff --git a/WebKitTools/MiniBrowser/win/BrowserView.cpp b/WebKitTools/MiniBrowser/win/BrowserView.cpp
index ee67a08..d3d5e72 100644
--- a/WebKitTools/MiniBrowser/win/BrowserView.cpp
+++ b/WebKitTools/MiniBrowser/win/BrowserView.cpp
@@ -106,5 +106,5 @@ void BrowserView::goToURL(const std::wstring& urlString)
WKPageRef page = WKViewGetPage(m_webView);
WKPageLoadURL(page, url);
- WKURLRelease(url);
+ WKRelease(url);
}
diff --git a/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp b/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp
index deed4ab..b9854c4 100644
--- a/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp
+++ b/WebKitTools/WebKitTestRunner/win/PlatformWebViewWin.cpp
@@ -60,7 +60,7 @@ PlatformWebView::~PlatformWebView()
{
if (::IsWindow(m_window))
::DestroyWindow(m_window);
- WKViewRelease(m_view);
+ WKRelease(m_view);
}
void PlatformWebView::resizeTo(unsigned width, unsigned height)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list