Changeset 185774 in webkit

Timestamp:

Jun 19, 2015, 4:25:51 PM (11 years ago)

Author:

Michael Catanzaro

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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp (modified) (1 diff)
• WebCore/platform/network/soup/WebKitSoupRequestGeneric.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-19  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [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  <dino@apple.com>
 

trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.cpp

@@ -101 +101 @@
 }
 
-const ResourceRequest& webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric* request)
+const ResourceRequest* webkitSoupRequestGenericGetRequest(WebKitSoupRequestGeneric* request)
 {
-    return request->priv->resourceRequest;
+    return &request->priv->resourceRequest;
 }

trunk/Source/WebCore/platform/network/soup/WebKitSoupRequestGeneric.h

@@ -59 +59 @@
 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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-19  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [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  <beidson@apple.com>
 

trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp

@@ -191 +191 @@
     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);
 }