Diff
Modified: trunk/Source/WebKit2/ChangeLog (159268 => 159269)
--- trunk/Source/WebKit2/ChangeLog 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-14 02:28:24 UTC (rev 159269)
@@ -1,3 +1,22 @@
+2013-11-13 Nick Diego Yamane <[email protected]>
+
+ Rename some ImmutableArray leftovers
+ https://bugs.webkit.org/show_bug.cgi?id=124320
+
+ Reviewed by Anders Carlsson.
+
+ ImmutableArray has been renamed to API::Array in r159234.
+
+ * Shared/API/c/WKContextMenuItem.cpp:
+ * Shared/WebContextMenuItem.cpp:
+ * Shared/WebContextMenuItem.h:
+ * UIProcess/API/C/WKBackForwardListRef.cpp:
+ * UIProcess/API/Cocoa/WKBackForwardList.mm:
+ * UIProcess/API/gtk/WebKitBackForwardList.cpp:
+ * UIProcess/API/gtk/WebKitWebViewGroup.cpp:
+ * UIProcess/WebBackForwardList.cpp:
+ * UIProcess/WebBackForwardList.h:
+
2013-11-13 Dan Bernstein <[email protected]>
REGRESSION (r159263): caused 50+ crashes on all mac webkit2 bots
Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp (159268 => 159269)
--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2013-11-14 02:28:24 UTC (rev 159269)
@@ -158,7 +158,7 @@
WKArrayRef WKContextMenuCopySubmenuItems(WKContextMenuItemRef itemRef)
{
#if ENABLE(CONTEXT_MENUS)
- return toAPI(toImpl(itemRef)->submenuItemsAsImmutableArray().leakRef());
+ return toAPI(toImpl(itemRef)->submenuItemsAsAPIArray().leakRef());
#else
return 0;
#endif
Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp (159268 => 159269)
--- trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp 2013-11-14 02:28:24 UTC (rev 159269)
@@ -22,7 +22,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-
+
#include "config.h"
#if ENABLE(CONTEXT_MENUS)
@@ -42,16 +42,16 @@
PassRefPtr<WebContextMenuItem> WebContextMenuItem::create(const String& title, bool enabled, API::Array* submenuItems)
{
size_t size = submenuItems->size();
-
+
Vector<WebContextMenuItemData> submenu;
submenu.reserveCapacity(size);
-
+
for (size_t i = 0; i < size; ++i) {
WebContextMenuItem* item = submenuItems->at<WebContextMenuItem>(i);
if (item)
submenu.append(*item->data());
}
-
+
return adoptRef(new WebContextMenuItem(WebContextMenuItemData(WebCore::ContextMenuItemTagNoAction, title, enabled, submenu))).leakRef();
}
@@ -61,8 +61,8 @@
return separatorItem;
}
-PassRefPtr<API::Array> WebContextMenuItem::submenuItemsAsImmutableArray() const
-{
+PassRefPtr<API::Array> WebContextMenuItem::submenuItemsAsAPIArray() const
+{
if (m_webContextMenuItemData.type() != WebCore::SubmenuType)
return API::Array::create();
Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.h (159268 => 159269)
--- trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.h 2013-11-14 02:28:24 UTC (rev 159269)
@@ -45,12 +45,12 @@
}
static PassRefPtr<WebContextMenuItem> create(const String& title, bool enabled, API::Array* submenuItems);
static WebContextMenuItem* separatorItem();
-
- PassRefPtr<API::Array> submenuItemsAsImmutableArray() const;
-
+
+ PassRefPtr<API::Array> submenuItemsAsAPIArray() const;
+
API::Object* userData() const;
void setUserData(API::Object*);
-
+
WebContextMenuItemData* data() { return &m_webContextMenuItemData; }
private:
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp (159268 => 159269)
--- trunk/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp 2013-11-14 02:28:24 UTC (rev 159269)
@@ -69,10 +69,10 @@
WKArrayRef WKBackForwardListCopyBackListWithLimit(WKBackForwardListRef listRef, unsigned limit)
{
- return toAPI(toImpl(listRef)->backListAsImmutableArrayWithLimit(limit).leakRef());
+ return toAPI(toImpl(listRef)->backListAsAPIArrayWithLimit(limit).leakRef());
}
WKArrayRef WKBackForwardListCopyForwardListWithLimit(WKBackForwardListRef listRef, unsigned limit)
{
- return toAPI(toImpl(listRef)->forwardListAsImmutableArrayWithLimit(limit).leakRef());
+ return toAPI(toImpl(listRef)->forwardListAsAPIArrayWithLimit(limit).leakRef());
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm (159268 => 159269)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm 2013-11-14 02:28:24 UTC (rev 159269)
@@ -84,7 +84,7 @@
- (NSArray *)backListWithLimit:(NSUInteger)limit
{
- RefPtr<API::Array> list = reinterpret_cast<WebBackForwardList*>(&_list)->backListAsImmutableArrayWithLimit(limit);
+ RefPtr<API::Array> list = reinterpret_cast<WebBackForwardList*>(&_list)->backListAsAPIArrayWithLimit(limit);
if (!list)
return nil;
@@ -93,7 +93,7 @@
- (NSArray *)forwardListWithLimit:(NSUInteger)limit
{
- RefPtr<API::Array> list = reinterpret_cast<WebBackForwardList*>(&_list)->forwardListAsImmutableArrayWithLimit(limit);
+ RefPtr<API::Array> list = reinterpret_cast<WebBackForwardList*>(&_list)->forwardListAsAPIArrayWithLimit(limit);
if (!list)
return nil;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (159268 => 159269)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2013-11-14 02:28:24 UTC (rev 159269)
@@ -252,8 +252,8 @@
g_return_val_if_fail(WEBKIT_IS_BACK_FORWARD_LIST(backForwardList), 0);
WebKitBackForwardListPrivate* priv = backForwardList->priv;
- RefPtr<API::Array> immutableArray = priv->backForwardItems->backListAsImmutableArrayWithLimit(limit);
- return webkitBackForwardListCreateList(backForwardList, immutableArray.get());
+ RefPtr<API::Array> apiArray = priv->backForwardItems->backListAsAPIArrayWithLimit(limit);
+ return webkitBackForwardListCreateList(backForwardList, apiArray.get());
}
/**
@@ -283,6 +283,6 @@
g_return_val_if_fail(WEBKIT_IS_BACK_FORWARD_LIST(backForwardList), 0);
WebKitBackForwardListPrivate* priv = backForwardList->priv;
- RefPtr<API::Array> immutableArray = priv->backForwardItems->forwardListAsImmutableArrayWithLimit(limit);
- return webkitBackForwardListCreateList(backForwardList, immutableArray.get());
+ RefPtr<API::Array> apiArray = priv->backForwardItems->forwardListAsAPIArrayWithLimit(limit);
+ return webkitBackForwardListCreateList(backForwardList, apiArray.get());
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp (159268 => 159269)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2013-11-14 02:28:24 UTC (rev 159269)
@@ -226,7 +226,7 @@
COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_INJECTED_CONTENT_FRAMES_ALL, WebCore::InjectInAllFrames);
COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_INJECTED_CONTENT_FRAMES_TOP_ONLY, WebCore::InjectInTopFrameOnly);
-static PassRefPtr<API::Array> toImmutableArray(const char* const* list)
+static PassRefPtr<API::Array> toAPIArray(const char* const* list)
{
if (!list)
return 0;
@@ -260,8 +260,8 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW_GROUP(group));
g_return_if_fail(source);
- RefPtr<API::Array> webWhitelist = toImmutableArray(whitelist);
- RefPtr<API::Array> webBlacklist = toImmutableArray(blacklist);
+ RefPtr<API::Array> webWhitelist = toAPIArray(whitelist);
+ RefPtr<API::Array> webBlacklist = toAPIArray(blacklist);
// We always use UserStyleUserLevel to match the behavior of WKPageGroupAddUserStyleSheet.
group->priv->pageGroup->addUserStyleSheet(
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (159268 => 159269)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2013-11-14 02:28:24 UTC (rev 159269)
@@ -201,7 +201,7 @@
return m_page && m_hasCurrentIndex ? m_entries.size() - (m_currentIndex + 1) : 0;
}
-PassRefPtr<API::Array> WebBackForwardList::backListAsImmutableArrayWithLimit(unsigned limit) const
+PassRefPtr<API::Array> WebBackForwardList::backListAsAPIArrayWithLimit(unsigned limit) const
{
ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
@@ -225,7 +225,7 @@
return API::Array::create(std::move(vector));
}
-PassRefPtr<API::Array> WebBackForwardList::forwardListAsImmutableArrayWithLimit(unsigned limit) const
+PassRefPtr<API::Array> WebBackForwardList::forwardListAsAPIArrayWithLimit(unsigned limit) const
{
ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (159268 => 159269)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2013-11-14 02:24:46 UTC (rev 159268)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2013-11-14 02:28:24 UTC (rev 159269)
@@ -69,8 +69,8 @@
int backListCount() const;
int forwardListCount() const;
- PassRefPtr<API::Array> backListAsImmutableArrayWithLimit(unsigned limit) const;
- PassRefPtr<API::Array> forwardListAsImmutableArrayWithLimit(unsigned limit) const;
+ PassRefPtr<API::Array> backListAsAPIArrayWithLimit(unsigned limit) const;
+ PassRefPtr<API::Array> forwardListAsAPIArrayWithLimit(unsigned limit) const;
#if USE(CF)
CFDictionaryRef createCFDictionaryRepresentation(WebPageProxy::WebPageProxySessionStateFilterCallback, void* context) const;
