Title: [191471] trunk/Source/WebKit2
Revision
191471
Author
[email protected]
Date
2015-10-22 14:00:31 -0700 (Thu, 22 Oct 2015)

Log Message

CTTE WebContextMenuItemData
https://bugs.webkit.org/show_bug.cgi?id=150471

Reviewed by Tim Horton.

* Shared/API/c/WKContextMenuItem.cpp:
(WKContextMenuItemGetTag):
(WKContextMenuItemGetType):
(WKContextMenuItemCopyTitle):
(WKContextMenuItemGetEnabled):
(WKContextMenuItemGetChecked):
* Shared/WebContextMenuItem.cpp:
(WebKit::WebContextMenuItem::create):
* Shared/WebContextMenuItem.h:
(WebKit::WebContextMenuItem::data):
* UIProcess/API/C/WKPage.cpp:
(WKPageSelectContextMenuItem):
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::nsMenuItem):
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageClickMenuItem):
* WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
(WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (191470 => 191471)


--- trunk/Source/WebKit2/ChangeLog	2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-22 21:00:31 UTC (rev 191471)
@@ -1,5 +1,31 @@
 2015-10-22  Anders Carlsson  <[email protected]>
 
+        CTTE WebContextMenuItemData
+        https://bugs.webkit.org/show_bug.cgi?id=150471
+
+        Reviewed by Tim Horton.
+
+        * Shared/API/c/WKContextMenuItem.cpp:
+        (WKContextMenuItemGetTag):
+        (WKContextMenuItemGetType):
+        (WKContextMenuItemCopyTitle):
+        (WKContextMenuItemGetEnabled):
+        (WKContextMenuItemGetChecked):
+        * Shared/WebContextMenuItem.cpp:
+        (WebKit::WebContextMenuItem::create):
+        * Shared/WebContextMenuItem.h:
+        (WebKit::WebContextMenuItem::data):
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSelectContextMenuItem):
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (WebKit::nsMenuItem):
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageClickMenuItem):
+        * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
+        (WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems):
+
+2015-10-22  Anders Carlsson  <[email protected]>
+
         Handle nil menu items.
 
         * UIProcess/mac/WebContextMenuProxyMac.mm:

Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp (191470 => 191471)


--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp	2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp	2015-10-22 21:00:31 UTC (rev 191471)
@@ -93,7 +93,7 @@
 WKContextMenuItemTag WKContextMenuItemGetTag(WKContextMenuItemRef itemRef)
 {
 #if ENABLE(CONTEXT_MENUS)
-    return toAPI(toImpl(itemRef)->data()->action());
+    return toAPI(toImpl(itemRef)->data().action());
 #else
     UNUSED_PARAM(itemRef);
     return toAPI(ContextMenuItemTagNoAction);
@@ -103,7 +103,7 @@
 WKContextMenuItemType WKContextMenuItemGetType(WKContextMenuItemRef itemRef)
 {
 #if ENABLE(CONTEXT_MENUS)
-    return toAPI(toImpl(itemRef)->data()->type());
+    return toAPI(toImpl(itemRef)->data().type());
 #else
     UNUSED_PARAM(itemRef);
     return toAPI(ActionType);
@@ -113,7 +113,7 @@
 WKStringRef WKContextMenuItemCopyTitle(WKContextMenuItemRef itemRef)
 {
 #if ENABLE(CONTEXT_MENUS)
-    return toCopiedAPI(toImpl(itemRef)->data()->title().impl());
+    return toCopiedAPI(toImpl(itemRef)->data().title().impl());
 #else
     UNUSED_PARAM(itemRef);
     return 0;
@@ -123,7 +123,7 @@
 bool WKContextMenuItemGetEnabled(WKContextMenuItemRef itemRef)
 {
 #if ENABLE(CONTEXT_MENUS)
-    return toImpl(itemRef)->data()->enabled();
+    return toImpl(itemRef)->data().enabled();
 #else
     UNUSED_PARAM(itemRef);
     return false;
@@ -133,7 +133,7 @@
 bool WKContextMenuItemGetChecked(WKContextMenuItemRef itemRef)
 {
 #if ENABLE(CONTEXT_MENUS)
-    return toImpl(itemRef)->data()->checked();
+    return toImpl(itemRef)->data().checked();
 #else
     UNUSED_PARAM(itemRef);
     return false;

Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp (191470 => 191471)


--- trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp	2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.cpp	2015-10-22 21:00:31 UTC (rev 191471)
@@ -56,7 +56,7 @@
     for (size_t i = 0; i < size; ++i) {
         WebContextMenuItem* item = submenuItems->at<WebContextMenuItem>(i);
         if (item)
-            submenu.append(*item->data());
+            submenu.append(item->data());
     }
 
     return adoptRef(new WebContextMenuItem(WebContextMenuItemData(WebCore::ContextMenuItemTagNoAction, title, enabled, submenu))).leakRef();

Modified: trunk/Source/WebKit2/Shared/WebContextMenuItem.h (191470 => 191471)


--- trunk/Source/WebKit2/Shared/WebContextMenuItem.h	2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItem.h	2015-10-22 21:00:31 UTC (rev 191471)
@@ -62,7 +62,7 @@
     API::Object* userData() const;
     void setUserData(API::Object*);
 
-    WebContextMenuItemData* data() { return &m_webContextMenuItemData; }
+    const WebContextMenuItemData& data() { return m_webContextMenuItemData; }
     NativeContextMenuItem* nativeContextMenuItem() { return m_nativeContextMenuItem.get(); }
 
 private:

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (191470 => 191471)


--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp	2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp	2015-10-22 21:00:31 UTC (rev 191471)
@@ -2423,7 +2423,7 @@
 void WKPageSelectContextMenuItem(WKPageRef page, WKContextMenuItemRef item)
 {
 #if ENABLE(CONTEXT_MENUS)
-    toImpl(page)->contextMenuItemSelected(*(toImpl(item)->data()));
+    toImpl(page)->contextMenuItemSelected((toImpl(item)->data()));
 #else
     UNUSED_PARAM(page);
     UNUSED_PARAM(item);

Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191470 => 191471)


--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm	2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm	2015-10-22 21:00:31 UTC (rev 191471)
@@ -232,8 +232,7 @@
     if (NativeContextMenuItem* nativeItem = item->nativeContextMenuItem())
         return nativeItem->nsMenuItem();
 
-    ASSERT(item->data());
-    return nsMenuItem(contextMenuProxy, *item->data());
+    return nsMenuItem(contextMenuProxy, item->data());
 }
 
 template<typename ItemType> static Vector<RetainPtr<NSMenuItem>> nsMenuItemVector(WebContextMenuProxyMac& contextMenuProxy, const Vector<ItemType>& items)

Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (191470 => 191471)


--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp	2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp	2015-10-22 21:00:31 UTC (rev 191471)
@@ -174,7 +174,7 @@
 void WKBundlePageClickMenuItem(WKBundlePageRef pageRef, WKContextMenuItemRef item)
 {
 #if ENABLE(CONTEXT_MENUS)
-    toImpl(pageRef)->contextMenu()->itemSelected(*toImpl(item)->data());
+    toImpl(pageRef)->contextMenu()->itemSelected(toImpl(item)->data());
 #else
     UNUSED_PARAM(pageRef);
     UNUSED_PARAM(item);

Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp (191470 => 191471)


--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp	2015-10-22 20:37:34 UTC (rev 191470)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp	2015-10-22 21:00:31 UTC (rev 191471)
@@ -77,7 +77,7 @@
             continue;
         }
         
-        newMenu.append(*item->data());
+        newMenu.append(item->data());
     }
     
     return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to