Title: [159158] trunk/Source/WebKit2
- Revision
- 159158
- Author
- [email protected]
- Date
- 2013-11-12 16:28:05 -0800 (Tue, 12 Nov 2013)
Log Message
Fix GTK build after r159142
https://bugs.webkit.org/show_bug.cgi?id=124243
Patch by Nick Diego Yamane <[email protected]> on 2013-11-12
Reviewed by Anders Carlsson.
Use Vector + ImmutableArray instead of MutableArray
* UIProcess/API/gtk/WebKitContextMenuItem.cpp:
(webkitContextMenuItemCreate):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159157 => 159158)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 00:20:53 UTC (rev 159157)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 00:28:05 UTC (rev 159158)
@@ -1,3 +1,15 @@
+2013-11-12 Nick Diego Yamane <[email protected]>
+
+ Fix GTK build after r159142
+ https://bugs.webkit.org/show_bug.cgi?id=124243
+
+ Reviewed by Anders Carlsson.
+
+ Use Vector + ImmutableArray instead of MutableArray
+
+ * UIProcess/API/gtk/WebKitContextMenuItem.cpp:
+ (webkitContextMenuItemCreate):
+
2013-11-12 Anders Carlsson <[email protected]>
Remove ImmutableArray::isMutable
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp (159157 => 159158)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2013-11-13 00:20:53 UTC (rev 159157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2013-11-13 00:28:05 UTC (rev 159158)
@@ -20,7 +20,7 @@
#include "config.h"
#include "WebKitContextMenuItem.h"
-#include "MutableArray.h"
+#include "ImmutableArray.h"
#include "WebContextMenuItem.h"
#include "WebContextMenuItemData.h"
#include "WebKitContextMenuActionsPrivate.h"
@@ -100,11 +100,11 @@
if (!subMenu.size())
return item;
- RefPtr<MutableArray> subMenuItems = MutableArray::create();
- subMenuItems->reserveCapacity(subMenu.size());
+ Vector<RefPtr<APIObject>> subMenuItems;
+ subMenuItems.reserveInitialCapacity(subMenu.size());
for (size_t i = 0; i < subMenu.size(); ++i)
- subMenuItems->append(WebContextMenuItem::create(subMenu[i]).get());
- webkitContextMenuItemSetSubMenu(item, adoptGRef(webkitContextMenuCreate(subMenuItems.get())));
+ subMenuItems.uncheckedAppend(WebContextMenuItem::create(subMenu[i]).get());
+ webkitContextMenuItemSetSubMenu(item, adoptGRef(webkitContextMenuCreate(ImmutableArray::create(std::move(subMenuItems)).get())));
return item;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
