diff options
Diffstat (limited to 'Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp | 48 |
1 files changed, 8 insertions, 40 deletions
diff --git a/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp b/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp index 53064ff50..0514f1825 100644 --- a/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp +++ b/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp @@ -32,10 +32,6 @@ #include "WKAPICast.h" #include "WKContextMenuItemTypes.h" -#if PLATFORM(MAC) -#import <mach-o/dyld.h> -#endif - using namespace WebCore; using namespace WebKit; @@ -51,7 +47,7 @@ WKTypeID WKContextMenuItemGetTypeID() WKContextMenuItemRef WKContextMenuItemCreateAsAction(WKContextMenuItemTag tag, WKStringRef title, bool enabled) { #if ENABLE(CONTEXT_MENUS) - return toAPI(WebContextMenuItem::create(WebContextMenuItemData(ActionType, toImpl(tag), toImpl(title)->string(), enabled, false)).leakRef()); + return toAPI(&WebContextMenuItem::create(WebContextMenuItemData(ActionType, toImpl(tag), toImpl(title)->string(), enabled, false)).leakRef()); #else UNUSED_PARAM(tag); UNUSED_PARAM(title); @@ -63,7 +59,7 @@ WKContextMenuItemRef WKContextMenuItemCreateAsAction(WKContextMenuItemTag tag, W WKContextMenuItemRef WKContextMenuItemCreateAsCheckableAction(WKContextMenuItemTag tag, WKStringRef title, bool enabled, bool checked) { #if ENABLE(CONTEXT_MENUS) - return toAPI(WebContextMenuItem::create(WebContextMenuItemData(CheckableActionType, toImpl(tag), toImpl(title)->string(), enabled, checked)).leakRef()); + return toAPI(&WebContextMenuItem::create(WebContextMenuItemData(CheckableActionType, toImpl(tag), toImpl(title)->string(), enabled, checked)).leakRef()); #else UNUSED_PARAM(tag); UNUSED_PARAM(title); @@ -94,38 +90,10 @@ WKContextMenuItemRef WKContextMenuItemSeparatorItem() #endif } -#if ENABLE(CONTEXT_MENUS) -#if PLATFORM(MAC) -static WKContextMenuItemTag compatibleContextMenuItemTag(WKContextMenuItemTag tag) -{ - static bool needsWorkaround = ^bool { - const int32_t safariFrameworkVersionWithIncompatibleContextMenuItemTags = 0x02181900; // 536.25.0 (Safari 6.0) - return NSVersionOfRunTimeLibrary("Safari") == safariFrameworkVersionWithIncompatibleContextMenuItemTags; - }(); - - if (!needsWorkaround) - return tag; - - // kWKContextMenuItemTagDictationAlternative was inserted before kWKContextMenuItemTagInspectElement. - // DictationAlternative is now at the end like it should have been. To be compatible we need to return - // InspectElement for DictationAlternative and shift InspectElement and after by one. - if (tag == kWKContextMenuItemTagDictationAlternative) - return kWKContextMenuItemTagInspectElement; - if (tag >= kWKContextMenuItemTagInspectElement && tag < kWKContextMenuItemBaseApplicationTag) - return tag + 1; - return tag; -} -#endif -#endif // ENABLE(CONTEXT_MENUS) - WKContextMenuItemTag WKContextMenuItemGetTag(WKContextMenuItemRef itemRef) { #if ENABLE(CONTEXT_MENUS) -#if PLATFORM(MAC) - return compatibleContextMenuItemTag(toAPI(toImpl(itemRef)->data()->action())); -#else - return toAPI(toImpl(itemRef)->data()->action()); -#endif + return toAPI(toImpl(itemRef)->data().action()); #else UNUSED_PARAM(itemRef); return toAPI(ContextMenuItemTagNoAction); @@ -135,7 +103,7 @@ WKContextMenuItemTag WKContextMenuItemGetTag(WKContextMenuItemRef itemRef) 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); @@ -145,7 +113,7 @@ WKContextMenuItemType WKContextMenuItemGetType(WKContextMenuItemRef itemRef) 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; @@ -155,7 +123,7 @@ WKStringRef WKContextMenuItemCopyTitle(WKContextMenuItemRef itemRef) bool WKContextMenuItemGetEnabled(WKContextMenuItemRef itemRef) { #if ENABLE(CONTEXT_MENUS) - return toImpl(itemRef)->data()->enabled(); + return toImpl(itemRef)->data().enabled(); #else UNUSED_PARAM(itemRef); return false; @@ -165,7 +133,7 @@ bool WKContextMenuItemGetEnabled(WKContextMenuItemRef itemRef) bool WKContextMenuItemGetChecked(WKContextMenuItemRef itemRef) { #if ENABLE(CONTEXT_MENUS) - return toImpl(itemRef)->data()->checked(); + return toImpl(itemRef)->data().checked(); #else UNUSED_PARAM(itemRef); return false; @@ -175,7 +143,7 @@ bool WKContextMenuItemGetChecked(WKContextMenuItemRef itemRef) WKArrayRef WKContextMenuCopySubmenuItems(WKContextMenuItemRef itemRef) { #if ENABLE(CONTEXT_MENUS) - return toAPI(toImpl(itemRef)->submenuItemsAsAPIArray().leakRef()); + return toAPI(&toImpl(itemRef)->submenuItemsAsAPIArray().leakRef()); #else UNUSED_PARAM(itemRef); return 0; |