Title: [143700] trunk/Source/WebKit2
- Revision
- 143700
- Author
- [email protected]
- Date
- 2013-02-22 00:55:18 -0800 (Fri, 22 Feb 2013)
Log Message
[WK2][EFL][GTK][Qt] Add context menu item tags for C API
https://bugs.webkit.org/show_bug.cgi?id=109815
Patch by Michał Pakuła vel Rutka <[email protected]> on 2013-02-22
Reviewed by Anders Carlsson.
This patch adds context menu item tags used by EFL, GTK and Qt ports, defined in
WebCore to WK2 C API.
* Shared/API/c/WKContextMenuItemTypes.h:
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI):
(WebKit::toImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (143699 => 143700)
--- trunk/Source/WebKit2/ChangeLog 2013-02-22 08:52:36 UTC (rev 143699)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-22 08:55:18 UTC (rev 143700)
@@ -1,3 +1,18 @@
+2013-02-22 Michał Pakuła vel Rutka <[email protected]>
+
+ [WK2][EFL][GTK][Qt] Add context menu item tags for C API
+ https://bugs.webkit.org/show_bug.cgi?id=109815
+
+ Reviewed by Anders Carlsson.
+
+ This patch adds context menu item tags used by EFL, GTK and Qt ports, defined in
+ WebCore to WK2 C API.
+
+ * Shared/API/c/WKContextMenuItemTypes.h:
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toAPI):
+ (WebKit::toImpl):
+
2013-02-22 Mikhail Pozdnyakov <[email protected]>
[WK2][EFL] Move AC code from EwkView to WebView
Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h (143699 => 143700)
--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h 2013-02-22 08:52:36 UTC (rev 143699)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h 2013-02-22 08:55:18 UTC (rev 143700)
@@ -114,6 +114,9 @@
kWKContextMenuItemTagMediaPlayPause,
kWKContextMenuItemTagMediaMute,
kWKContextMenuItemTagDictationAlternative,
+ kWKContextMenuItemTagCopyImageUrlToClipboard,
+ kWKContextMenuItemTagSelectAll,
+ kWKContextMenuItemTagOpenLinkInThisWindow,
kWKContextMenuItemBaseApplicationTag = 10000
};
typedef uint32_t WKContextMenuItemTag;
Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (143699 => 143700)
--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-02-22 08:52:36 UTC (rev 143699)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-02-22 08:55:18 UTC (rev 143700)
@@ -335,6 +335,10 @@
return kWKContextMenuItemTagDownloadImageToDisk;
case WebCore::ContextMenuItemTagCopyImageToClipboard:
return kWKContextMenuItemTagCopyImageToClipboard;
+#if PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
+ case WebCore::ContextMenuItemTagCopyImageUrlToClipboard:
+ return kWKContextMenuItemTagCopyImageUrlToClipboard;
+#endif
case WebCore::ContextMenuItemTagOpenFrameInNewWindow:
return kWKContextMenuItemTagOpenFrameInNewWindow;
case WebCore::ContextMenuItemTagCopy:
@@ -351,6 +355,10 @@
return kWKContextMenuItemTagCut;
case WebCore::ContextMenuItemTagPaste:
return kWKContextMenuItemTagPaste;
+#if PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
+ case WebCore::ContextMenuItemTagSelectAll:
+ return kWKContextMenuItemTagSelectAll;
+#endif
case WebCore::ContextMenuItemTagSpellingGuess:
return kWKContextMenuItemTagSpellingGuess;
case WebCore::ContextMenuItemTagNoGuessesFound:
@@ -491,6 +499,8 @@
case WebCore::ContextMenuItemTagChangeBack:
return kWKContextMenuItemTagChangeBack;
#endif
+ case WebCore::ContextMenuItemTagOpenLinkInThisWindow:
+ return kWKContextMenuItemTagOpenLinkInThisWindow;
default:
if (action < WebCore::ContextMenuItemBaseApplicationTag)
LOG_ERROR("ContextMenuAction %i is an unknown tag but is below the allowable custom tag value of %i", action, WebCore:: ContextMenuItemBaseApplicationTag);
@@ -516,6 +526,10 @@
case kWKContextMenuItemTagCopyImageToClipboard:
return WebCore::ContextMenuItemTagCopyImageToClipboard;
case kWKContextMenuItemTagOpenFrameInNewWindow:
+#if PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
+ case kWKContextMenuItemTagCopyImageUrlToClipboard:
+ return WebCore::ContextMenuItemTagCopyImageUrlToClipboard;
+#endif
return WebCore::ContextMenuItemTagOpenFrameInNewWindow;
case kWKContextMenuItemTagCopy:
return WebCore::ContextMenuItemTagCopy;
@@ -531,6 +545,10 @@
return WebCore::ContextMenuItemTagCut;
case kWKContextMenuItemTagPaste:
return WebCore::ContextMenuItemTagPaste;
+#if PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(QT)
+ case kWKContextMenuItemTagSelectAll:
+ return WebCore::ContextMenuItemTagSelectAll;
+#endif
case kWKContextMenuItemTagSpellingGuess:
return WebCore::ContextMenuItemTagSpellingGuess;
case kWKContextMenuItemTagNoGuessesFound:
@@ -671,6 +689,8 @@
case kWKContextMenuItemTagChangeBack:
return WebCore::ContextMenuItemTagChangeBack;
#endif
+ case kWKContextMenuItemTagOpenLinkInThisWindow:
+ return WebCore::ContextMenuItemTagOpenLinkInThisWindow;
default:
if (tag < kWKContextMenuItemBaseApplicationTag)
LOG_ERROR("WKContextMenuItemTag %i is an unknown tag but is below the allowable custom tag value of %i", tag, kWKContextMenuItemBaseApplicationTag);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes