Title: [185774] trunk/Source
- Revision
- 185774
- Author
- [email protected]
- Date
- 2015-06-19 16:25:51 -0700 (Fri, 19 Jun 2015)
Log Message
[SOUP] Fix return-type-c-linkage warning after r185553
https://bugs.webkit.org/show_bug.cgi?id=146014
Reviewed by Martin Robinson.
Source/WebCore:
* platform/network/soup/WebKitSoupRequestGeneric.cpp:
(webkitSoupRequestGenericGetRequest): Return a pointer rather than a reference.
* platform/network/soup/WebKitSoupRequestGeneric.h: webkitSoupRequestGenericGetRequest now
returns a pointer rather than a reference.
Source/WebKit2:
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
(WebKit::CustomProtocolManagerImpl::start): webkitSoupRequestGenericGetRequest now returns
a pointer rather than a reference.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (185773 => 185774)
--- trunk/Source/WebCore/ChangeLog 2015-06-19 22:40:25 UTC (rev 185773)
+++ trunk/Source/WebCore/ChangeLog 2015-06-19 23:25:51 UTC (rev 185774)
@@ -1,3 +1,15 @@
+2015-06-19 Michael Catanzaro <[email protected]>
+
+ [SOUP] Fix return-type-c-linkage warning after r185553
+ https://bugs.webkit.org/show_bug.cgi?id=146014
+
+ Reviewed by Martin Robinson.
+
+ * platform/network/soup/WebKitSoupRequestGeneric.cpp:
+ (webkitSoupRequestGenericGetRequest): Return a pointer rather than a reference.
+ * platform/network/soup/WebKitSoupRequestGeneric.h: webkitSoupRequestGenericGetRequest now
+ returns a pointer rather than a reference.
+
2015-06-19 Dean Jackson <[email protected]>
Played <audio> looks invisible against the gray background
Modified: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp (185773 => 185774)
--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp 2015-06-19 22:40:25 UTC (rev 185773)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp 2015-06-19 23:25:51 UTC (rev 185774)
@@ -100,7 +100,7 @@
request->priv->resourceRequest = resourceRequest;
}
-const ResourceRequest& webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric* request)
+const ResourceRequest* webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric* request)
{
- return request->priv->resourceRequest;
+ return &request->priv->resourceRequest;
}
Modified: trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h (185773 => 185774)
--- trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h 2015-06-19 22:40:25 UTC (rev 185773)
+++ trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h 2015-06-19 23:25:51 UTC (rev 185774)
@@ -58,7 +58,7 @@
void webkitSoupRequestGenericSetContentLength(WebKitSoupRequestGeneric*, goffset contentLength);
void webkitSoupRequestGenericSetContentType(WebKitSoupRequestGeneric*, const char* mimeType);
void webkitSoupRequestGenericSetRequest(WebKitSoupRequestGeneric*, const WebCore::ResourceRequest&);
-const WebCore::ResourceRequest& webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric*);
+const WebCore::ResourceRequest* webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric*);
G_END_DECLS
Modified: trunk/Source/WebKit2/ChangeLog (185773 => 185774)
--- trunk/Source/WebKit2/ChangeLog 2015-06-19 22:40:25 UTC (rev 185773)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-19 23:25:51 UTC (rev 185774)
@@ -1,3 +1,14 @@
+2015-06-19 Michael Catanzaro <[email protected]>
+
+ [SOUP] Fix return-type-c-linkage warning after r185553
+ https://bugs.webkit.org/show_bug.cgi?id=146014
+
+ Reviewed by Martin Robinson.
+
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
+ (WebKit::CustomProtocolManagerImpl::start): webkitSoupRequestGenericGetRequest now returns
+ a pointer rather than a reference.
+
2015-06-19 Brady Eidson <[email protected]>
Rename WKSecurityOrigin.h/cpp to WKSecurityOriginRef.h/cpp.
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (185773 => 185774)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2015-06-19 22:40:25 UTC (rev 185773)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2015-06-19 23:25:51 UTC (rev 185774)
@@ -190,7 +190,7 @@
WebKitSoupRequestGeneric* request = WEBKIT_SOUP_REQUEST_GENERIC(g_task_get_source_object(task));
m_customProtocolMap.set(customProtocolID, std::make_unique<WebSoupRequestAsyncData>(task, request));
- m_childProcess->send(Messages::CustomProtocolManagerProxy::StartLoading(customProtocolID, webkitSoupRequestGenericGetRequest(request)), 0);
+ m_childProcess->send(Messages::CustomProtocolManagerProxy::StartLoading(customProtocolID, *webkitSoupRequestGenericGetRequest(request)), 0);
}
GInputStream* CustomProtocolManagerImpl::finish(GTask* task, GError** error)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
