[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
beidson at apple.com
beidson at apple.com
Wed Dec 22 11:35:16 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 95534792bcb9a1d79866b13ea991fb687136d3bd
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 29 23:16:36 2010 +0000
2010-07-29 Brady Eidson <beidson at apple.com>
Reviewed by Sam Weinig.
Make all public facing client setters take const pointers
https://bugs.webkit.org/show_bug.cgi?id=43219
* UIProcess/API/C/WKContext.cpp:
(WKContextSetInjectedBundleClient):
(WKContextSetHistoryClient):
* UIProcess/API/C/WKContext.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageLoaderClient):
(WKPageSetPagePolicyClient):
(WKPageSetPageUIClient):
* UIProcess/API/C/WKPage.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::initializeInjectedBundleClient):
(WebKit::WebContext::initializeHistoryClient):
* UIProcess/WebContext.h:
* UIProcess/WebContextInjectedBundleClient.cpp:
(WebKit::WebContextInjectedBundleClient::initialize):
* UIProcess/WebContextInjectedBundleClient.h:
* UIProcess/WebHistoryClient.cpp:
(WebKit::WebHistoryClient::initialize):
* UIProcess/WebHistoryClient.h:
* UIProcess/WebLoaderClient.cpp:
(WebKit::WebLoaderClient::initialize):
* UIProcess/WebLoaderClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::initializeLoaderClient):
(WebKit::WebPageProxy::initializePolicyClient):
(WebKit::WebPageProxy::initializeUIClient):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPolicyClient.cpp:
(WebKit::WebPolicyClient::initialize):
* UIProcess/WebPolicyClient.h:
* UIProcess/WebUIClient.cpp:
(WebKit::WebUIClient::initialize):
* UIProcess/WebUIClient.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64317 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index afda1a2..6b2b4b9 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,52 @@
+2010-07-29 Brady Eidson <beidson at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Make all public facing client setters take const pointers
+ https://bugs.webkit.org/show_bug.cgi?id=43219
+
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetInjectedBundleClient):
+ (WKContextSetHistoryClient):
+ * UIProcess/API/C/WKContext.h:
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient):
+ (WKPageSetPagePolicyClient):
+ (WKPageSetPageUIClient):
+ * UIProcess/API/C/WKPage.h:
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::initializeInjectedBundleClient):
+ (WebKit::WebContext::initializeHistoryClient):
+ * UIProcess/WebContext.h:
+
+ * UIProcess/WebContextInjectedBundleClient.cpp:
+ (WebKit::WebContextInjectedBundleClient::initialize):
+ * UIProcess/WebContextInjectedBundleClient.h:
+
+ * UIProcess/WebHistoryClient.cpp:
+ (WebKit::WebHistoryClient::initialize):
+ * UIProcess/WebHistoryClient.h:
+
+ * UIProcess/WebLoaderClient.cpp:
+ (WebKit::WebLoaderClient::initialize):
+ * UIProcess/WebLoaderClient.h:
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::initializeLoaderClient):
+ (WebKit::WebPageProxy::initializePolicyClient):
+ (WebKit::WebPageProxy::initializeUIClient):
+ * UIProcess/WebPageProxy.h:
+
+ * UIProcess/WebPolicyClient.cpp:
+ (WebKit::WebPolicyClient::initialize):
+ * UIProcess/WebPolicyClient.h:
+
+ * UIProcess/WebUIClient.cpp:
+ (WebKit::WebUIClient::initialize):
+ * UIProcess/WebUIClient.h:
+
2010-07-29 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/C/WKContext.cpp b/WebKit2/UIProcess/API/C/WKContext.cpp
index fd4019e..720aee7 100644
--- a/WebKit2/UIProcess/API/C/WKContext.cpp
+++ b/WebKit2/UIProcess/API/C/WKContext.cpp
@@ -72,13 +72,13 @@ WKPreferencesRef WKContextGetPreferences(WKContextRef contextRef)
return toRef(toWK(contextRef)->preferences());
}
-void WKContextSetInjectedBundleClient(WKContextRef contextRef, WKContextInjectedBundleClient* wkClient)
+void WKContextSetInjectedBundleClient(WKContextRef contextRef, const WKContextInjectedBundleClient* wkClient)
{
if (wkClient && !wkClient->version)
toWK(contextRef)->initializeInjectedBundleClient(wkClient);
}
-void WKContextSetHistoryClient(WKContextRef contextRef, WKContextHistoryClient * wkClient)
+void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClient* wkClient)
{
if (wkClient && !wkClient->version)
toWK(contextRef)->initializeHistoryClient(wkClient);
diff --git a/WebKit2/UIProcess/API/C/WKContext.h b/WebKit2/UIProcess/API/C/WKContext.h
index 1dccb2e..9bd02bc 100644
--- a/WebKit2/UIProcess/API/C/WKContext.h
+++ b/WebKit2/UIProcess/API/C/WKContext.h
@@ -69,8 +69,8 @@ WK_EXPORT WKContextRef WKContextGetSharedProcessContext();
WK_EXPORT void WKContextSetPreferences(WKContextRef context, WKPreferencesRef preferences);
WK_EXPORT WKPreferencesRef WKContextGetPreferences(WKContextRef context);
-WK_EXPORT void WKContextSetHistoryClient(WKContextRef context, WKContextHistoryClient * client);
-WK_EXPORT void WKContextSetInjectedBundleClient(WKContextRef context, WKContextInjectedBundleClient * client);
+WK_EXPORT void WKContextSetHistoryClient(WKContextRef context, const WKContextHistoryClient* client);
+WK_EXPORT void WKContextSetInjectedBundleClient(WKContextRef context, const WKContextInjectedBundleClient* client);
WK_EXPORT void WKContextPostMessageToInjectedBundle(WKContextRef context, WKStringRef message);
diff --git a/WebKit2/UIProcess/API/C/WKPage.cpp b/WebKit2/UIProcess/API/C/WKPage.cpp
index d8e2d5c..a27faa3 100644
--- a/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -131,19 +131,19 @@ void WKPageTerminate(WKPageRef pageRef)
toWK(pageRef)->terminateProcess();
}
-void WKPageSetPageLoaderClient(WKPageRef pageRef, WKPageLoaderClient* wkClient)
+void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClient* wkClient)
{
if (wkClient && !wkClient->version)
toWK(pageRef)->initializeLoaderClient(wkClient);
}
-void WKPageSetPagePolicyClient(WKPageRef pageRef, WKPagePolicyClient * wkClient)
+void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClient* wkClient)
{
if (wkClient && !wkClient->version)
toWK(pageRef)->initializePolicyClient(wkClient);
}
-void WKPageSetPageUIClient(WKPageRef pageRef, WKPageUIClient * wkClient)
+void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClient * wkClient)
{
if (wkClient && !wkClient->version)
toWK(pageRef)->initializeUIClient(wkClient);
diff --git a/WebKit2/UIProcess/API/C/WKPage.h b/WebKit2/UIProcess/API/C/WKPage.h
index dd4d381..ad37421 100644
--- a/WebKit2/UIProcess/API/C/WKPage.h
+++ b/WebKit2/UIProcess/API/C/WKPage.h
@@ -160,9 +160,9 @@ WK_EXPORT double WKPageGetEstimatedProgress(WKPageRef page);
WK_EXPORT void WKPageTerminate(WKPageRef page);
-WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, WKPageLoaderClient * client);
-WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, WKPagePolicyClient * client);
-WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, WKPageUIClient * client);
+WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, const WKPageLoaderClient* client);
+WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClient* client);
+WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClient* client);
typedef void (*WKPageRunJavaScriptFunction)(WKStringRef, void*);
typedef void (*WKPageRunJavaScriptDisposeFunction)(void*);
diff --git a/WebKit2/UIProcess/WebContext.cpp b/WebKit2/UIProcess/WebContext.cpp
index cd526b5..feecbda 100644
--- a/WebKit2/UIProcess/WebContext.cpp
+++ b/WebKit2/UIProcess/WebContext.cpp
@@ -83,12 +83,12 @@ WebContext::~WebContext()
#endif
}
-void WebContext::initializeInjectedBundleClient(WKContextInjectedBundleClient* client)
+void WebContext::initializeInjectedBundleClient(const WKContextInjectedBundleClient* client)
{
m_injectedBundleClient.initialize(client);
}
-void WebContext::initializeHistoryClient(WKContextHistoryClient* client)
+void WebContext::initializeHistoryClient(const WKContextHistoryClient* client)
{
m_historyClient.initialize(client);
diff --git a/WebKit2/UIProcess/WebContext.h b/WebKit2/UIProcess/WebContext.h
index 0c67d73..c218a49 100644
--- a/WebKit2/UIProcess/WebContext.h
+++ b/WebKit2/UIProcess/WebContext.h
@@ -58,8 +58,8 @@ public:
~WebContext();
- void initializeInjectedBundleClient(WKContextInjectedBundleClient*);
- void initializeHistoryClient(WKContextHistoryClient*);
+ void initializeInjectedBundleClient(const WKContextInjectedBundleClient*);
+ void initializeHistoryClient(const WKContextHistoryClient*);
ProcessModel processModel() const { return m_processModel; }
WebProcessProxy* process() const { return m_process.get(); }
diff --git a/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp b/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp
index 449516e..3434af1 100644
--- a/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp
+++ b/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp
@@ -37,7 +37,7 @@ WebContextInjectedBundleClient::WebContextInjectedBundleClient()
initialize(0);
}
-void WebContextInjectedBundleClient::initialize(WKContextInjectedBundleClient* client)
+void WebContextInjectedBundleClient::initialize(const WKContextInjectedBundleClient* client)
{
if (client && !client->version)
m_client = *client;
diff --git a/WebKit2/UIProcess/WebContextInjectedBundleClient.h b/WebKit2/UIProcess/WebContextInjectedBundleClient.h
index 3e875e8..121f716 100644
--- a/WebKit2/UIProcess/WebContextInjectedBundleClient.h
+++ b/WebKit2/UIProcess/WebContextInjectedBundleClient.h
@@ -39,7 +39,7 @@ class WebContext;
class WebContextInjectedBundleClient {
public:
WebContextInjectedBundleClient();
- void initialize(WKContextInjectedBundleClient*);
+ void initialize(const WKContextInjectedBundleClient*);
void didReceiveMessageFromInjectedBundle(WebContext*, const WebCore::String&);
diff --git a/WebKit2/UIProcess/WebHistoryClient.cpp b/WebKit2/UIProcess/WebHistoryClient.cpp
index fe4a6dc..8175b12 100644
--- a/WebKit2/UIProcess/WebHistoryClient.cpp
+++ b/WebKit2/UIProcess/WebHistoryClient.cpp
@@ -38,7 +38,7 @@ WebHistoryClient::WebHistoryClient()
initialize(0);
}
-void WebHistoryClient::initialize(WKContextHistoryClient* client)
+void WebHistoryClient::initialize(const WKContextHistoryClient* client)
{
if (client && !client->version)
m_contextHistoryClient = *client;
diff --git a/WebKit2/UIProcess/WebHistoryClient.h b/WebKit2/UIProcess/WebHistoryClient.h
index c81ea2f..3ce6ad2 100644
--- a/WebKit2/UIProcess/WebHistoryClient.h
+++ b/WebKit2/UIProcess/WebHistoryClient.h
@@ -42,7 +42,7 @@ class WebPageProxy;
class WebHistoryClient {
public:
WebHistoryClient();
- void initialize(WKContextHistoryClient*);
+ void initialize(const WKContextHistoryClient*);
void didNavigateWithNavigationData(WebContext*, WebPageProxy*, const WebNavigationDataStore&, WebFrameProxy*);
void didPerformClientRedirect(WebContext*, WebPageProxy*, const WebCore::String& sourceURL, const WebCore::String& destinationURL, WebFrameProxy*);
diff --git a/WebKit2/UIProcess/WebLoaderClient.cpp b/WebKit2/UIProcess/WebLoaderClient.cpp
index fd6bc17..8f0ec58 100644
--- a/WebKit2/UIProcess/WebLoaderClient.cpp
+++ b/WebKit2/UIProcess/WebLoaderClient.cpp
@@ -35,7 +35,7 @@ WebLoaderClient::WebLoaderClient()
initialize(0);
}
-void WebLoaderClient::initialize(WKPageLoaderClient* client)
+void WebLoaderClient::initialize(const WKPageLoaderClient* client)
{
if (client && !client->version)
m_pageLoaderClient = *client;
diff --git a/WebKit2/UIProcess/WebLoaderClient.h b/WebKit2/UIProcess/WebLoaderClient.h
index 1909f94..1d07de4 100644
--- a/WebKit2/UIProcess/WebLoaderClient.h
+++ b/WebKit2/UIProcess/WebLoaderClient.h
@@ -40,7 +40,7 @@ class WebFrameProxy;
class WebLoaderClient {
public:
WebLoaderClient();
- void initialize(WKPageLoaderClient*);
+ void initialize(const WKPageLoaderClient*);
void didStartProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*);
void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*);
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index e7625e3..5ef7e6f 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -107,17 +107,17 @@ void WebPageProxy::setDrawingArea(PassOwnPtr<DrawingAreaProxy> drawingArea)
m_drawingArea = drawingArea;
}
-void WebPageProxy::initializeLoaderClient(WKPageLoaderClient* loadClient)
+void WebPageProxy::initializeLoaderClient(const WKPageLoaderClient* loadClient)
{
m_loaderClient.initialize(loadClient);
}
-void WebPageProxy::initializePolicyClient(WKPagePolicyClient* policyClient)
+void WebPageProxy::initializePolicyClient(const WKPagePolicyClient* policyClient)
{
m_policyClient.initialize(policyClient);
}
-void WebPageProxy::initializeUIClient(WKPageUIClient* client)
+void WebPageProxy::initializeUIClient(const WKPageUIClient* client)
{
m_uiClient.initialize(client);
}
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 393cb82..bc7e793 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -89,9 +89,9 @@ public:
WebBackForwardList* backForwardList() { return m_backForwardList.get(); }
void setPageClient(PageClient*);
- void initializeLoaderClient(WKPageLoaderClient*);
- void initializePolicyClient(WKPagePolicyClient*);
- void initializeUIClient(WKPageUIClient*);
+ void initializeLoaderClient(const WKPageLoaderClient*);
+ void initializePolicyClient(const WKPagePolicyClient*);
+ void initializeUIClient(const WKPageUIClient*);
void revive();
diff --git a/WebKit2/UIProcess/WebPolicyClient.cpp b/WebKit2/UIProcess/WebPolicyClient.cpp
index 5f65c84..8c6fad8 100644
--- a/WebKit2/UIProcess/WebPolicyClient.cpp
+++ b/WebKit2/UIProcess/WebPolicyClient.cpp
@@ -37,7 +37,7 @@ WebPolicyClient::WebPolicyClient()
initialize(0);
}
-void WebPolicyClient::initialize(WKPagePolicyClient* client)
+void WebPolicyClient::initialize(const WKPagePolicyClient* client)
{
if (client && !client->version)
m_pagePolicyClient = *client;
diff --git a/WebKit2/UIProcess/WebPolicyClient.h b/WebKit2/UIProcess/WebPolicyClient.h
index fb9e9ac..5a6390a 100644
--- a/WebKit2/UIProcess/WebPolicyClient.h
+++ b/WebKit2/UIProcess/WebPolicyClient.h
@@ -42,7 +42,7 @@ class WebFramePolicyListenerProxy;
class WebPolicyClient {
public:
WebPolicyClient();
- void initialize(WKPagePolicyClient*);
+ void initialize(const WKPagePolicyClient*);
bool decidePolicyForNavigationAction(WebPageProxy*, WebCore::NavigationType, const WebCore::String& url, WebFrameProxy*, WebFramePolicyListenerProxy*);
bool decidePolicyForNewWindowAction(WebPageProxy*, WebCore::NavigationType, const WebCore::String& url, WebFrameProxy*, WebFramePolicyListenerProxy*);
diff --git a/WebKit2/UIProcess/WebUIClient.cpp b/WebKit2/UIProcess/WebUIClient.cpp
index 95f3ce5..db7054d 100644
--- a/WebKit2/UIProcess/WebUIClient.cpp
+++ b/WebKit2/UIProcess/WebUIClient.cpp
@@ -38,7 +38,7 @@ WebUIClient::WebUIClient()
initialize(0);
}
-void WebUIClient::initialize(WKPageUIClient* client)
+void WebUIClient::initialize(const WKPageUIClient* client)
{
if (client && !client->version)
m_pageUIClient = *client;
diff --git a/WebKit2/UIProcess/WebUIClient.h b/WebKit2/UIProcess/WebUIClient.h
index a656624..27c5bc0 100644
--- a/WebKit2/UIProcess/WebUIClient.h
+++ b/WebKit2/UIProcess/WebUIClient.h
@@ -40,7 +40,7 @@ class WebPageProxy;
class WebUIClient {
public:
WebUIClient();
- void initialize(WKPageUIClient*);
+ void initialize(const WKPageUIClient*);
WebPageProxy* createNewPage(WebPageProxy*);
void showPage(WebPageProxy*);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list