Title: [159134] trunk/Source/WebKit2
- Revision
- 159134
- Author
- [email protected]
- Date
- 2013-11-12 12:19:12 -0800 (Tue, 12 Nov 2013)
Log Message
Unreviewed GTK build fix after r159129.
* UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
(webkit_file_chooser_request_select_files): Use ImmutableArray::create() instead.
* UIProcess/API/gtk/WebKitWebViewGroup.cpp:
(toImmutableArray): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159133 => 159134)
--- trunk/Source/WebKit2/ChangeLog 2013-11-12 20:16:45 UTC (rev 159133)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-12 20:19:12 UTC (rev 159134)
@@ -1,3 +1,12 @@
+2013-11-12 Zan Dobersek <[email protected]>
+
+ Unreviewed GTK build fix after r159129.
+
+ * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+ (webkit_file_chooser_request_select_files): Use ImmutableArray::create() instead.
+ * UIProcess/API/gtk/WebKitWebViewGroup.cpp:
+ (toImmutableArray): Ditto.
+
2013-11-12 Anders Carlsson <[email protected]>
Stop using WKArrayCreate internally
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (159133 => 159134)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2013-11-12 20:16:45 UTC (rev 159133)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2013-11-12 20:19:12 UTC (rev 159134)
@@ -314,7 +314,7 @@
g_ptr_array_add(selectedFiles.get(), 0);
// Select the files in WebCore and update local private attributes.
- request->priv->listener->chooseFiles(ImmutableArray::adopt(choosenFiles).get());
+ request->priv->listener->chooseFiles(ImmutableArray::create(std::move(choosenFiles)).get());
request->priv->selectedFiles = selectedFiles;
request->priv->handledRequest = true;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp (159133 => 159134)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2013-11-12 20:16:45 UTC (rev 159133)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2013-11-12 20:19:12 UTC (rev 159134)
@@ -236,7 +236,7 @@
entries.append(WebString::createFromUTF8String(*list));
list++;
}
- return ImmutableArray::adopt(entries);
+ return ImmutableArray::create(std::move(entries));
}
/**
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
