Title: [170633] trunk/Source/WebKit2
- Revision
- 170633
- Author
- commit-qu...@webkit.org
- Date
- 2014-07-01 02:10:56 -0700 (Tue, 01 Jul 2014)
Log Message
[GTK] Annotations for WebResource.get_data produce wrong signature in Vala binding
https://bugs.webkit.org/show_bug.cgi?id=134476
Patch by Evan Nemerson <e...@nemerson.com> on 2014-07-01
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/WebKitWebResource.cpp: Add array length and
element-type annotations to return value of webkit_web_resource_get_data_finish().
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170632 => 170633)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 08:17:46 UTC (rev 170632)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 09:10:56 UTC (rev 170633)
@@ -1,3 +1,13 @@
+2014-07-01 Evan Nemerson <e...@nemerson.com>
+
+ [GTK] Annotations for WebResource.get_data produce wrong signature in Vala binding
+ https://bugs.webkit.org/show_bug.cgi?id=134476
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/WebKitWebResource.cpp: Add array length and
+ element-type annotations to return value of webkit_web_resource_get_data_finish().
+
2014-07-01 Gyuyoung Kim <gyuyoung....@samsung.com>
[WK2] Can not convert ‘sessionState.WebKit::SessionState::provisionalURL’ from ‘WebCore::URL’ to ‘bool’
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (170632 => 170633)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2014-07-01 08:17:46 UTC (rev 170632)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2014-07-01 09:10:56 UTC (rev 170633)
@@ -355,13 +355,14 @@
* webkit_web_resource_get_data_finish:
* @resource: a #WebKitWebResource
* @result: a #GAsyncResult
- * @length: (out): return location for the length of the resource data
+ * @length: (out) (allow-none): return location for the length of the resource data
* @error: return location for error or %NULL to ignore
*
* Finish an asynchronous operation started with webkit_web_resource_get_data().
*
- * Returns: (transfer full): a string with the data of @resource, or %NULL in case
- * of error. if @length is not %NULL, the size of the data will be assigned to it.
+ * Returns: (transfer full) (array length=length) (element-type guint8): a
+ * string with the data of @resource, or %NULL in case of error. if @length
+ * is not %NULL, the size of the data will be assigned to it.
*/
guchar* webkit_web_resource_get_data_finish(WebKitWebResource* resource, GAsyncResult* result, gsize* length, GError** error)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
