diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebKit2/Shared/API | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebKit2/Shared/API')
| -rw-r--r-- | Source/WebKit2/Shared/API/c/WKBase.h | 2 | ||||
| -rw-r--r-- | Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h | 1 | ||||
| -rw-r--r-- | Source/WebKit2/Shared/API/c/WKSharedAPICast.h | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/Source/WebKit2/Shared/API/c/WKBase.h b/Source/WebKit2/Shared/API/c/WKBase.h index 28e7aed62..37a64f052 100644 --- a/Source/WebKit2/Shared/API/c/WKBase.h +++ b/Source/WebKit2/Shared/API/c/WKBase.h @@ -98,6 +98,8 @@ typedef const struct OpaqueWKGrammarDetail* WKGrammarDetailRef; typedef const struct OpaqueWKHitTestResult* WKHitTestResultRef; typedef const struct OpaqueWKIconDatabase* WKIconDatabaseRef; typedef const struct OpaqueWKInspector* WKInspectorRef; +typedef const struct OpaqueWKIntentData* WKIntentDataRef; +typedef const struct OpaqueWKIntentServiceInfo* WKIntentServiceInfoRef; typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef; typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef; typedef const struct OpaqueWKNavigationData* WKNavigationDataRef; diff --git a/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h b/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h index a3536d96d..b326794de 100644 --- a/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h +++ b/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h @@ -88,6 +88,7 @@ enum { kWKContextMenuItemTagRightToLeft, kWKContextMenuItemTagPDFSinglePageScrolling, kWKContextMenuItemTagPDFFacingPagesScrolling, + kWKContextMenuItemTagDictationAlternative, kWKContextMenuItemTagInspectElement, kWKContextMenuItemTagTextDirectionMenu, kWKContextMenuItemTagTextDirectionDefault, diff --git a/Source/WebKit2/Shared/API/c/WKSharedAPICast.h b/Source/WebKit2/Shared/API/c/WKSharedAPICast.h index 5e4bf69ff..fd1a89675 100644 --- a/Source/WebKit2/Shared/API/c/WKSharedAPICast.h +++ b/Source/WebKit2/Shared/API/c/WKSharedAPICast.h @@ -414,6 +414,8 @@ inline WKContextMenuItemTag toAPI(WebCore::ContextMenuAction action) return kWKContextMenuItemTagPDFSinglePageScrolling; case WebCore::ContextMenuItemTagPDFFacingPagesScrolling: return kWKContextMenuItemTagPDFFacingPagesScrolling; + case WebCore::ContextMenuItemTagDictationAlternative: + return kWKContextMenuItemTagDictationAlternative; #if ENABLE(INSPECTOR) case WebCore::ContextMenuItemTagInspectElement: return kWKContextMenuItemTagInspectElement; @@ -592,6 +594,8 @@ inline WebCore::ContextMenuAction toImpl(WKContextMenuItemTag tag) return WebCore::ContextMenuItemTagPDFSinglePageScrolling; case kWKContextMenuItemTagPDFFacingPagesScrolling: return WebCore::ContextMenuItemTagPDFFacingPagesScrolling; + case kWKContextMenuItemTagDictationAlternative: + return WebCore::ContextMenuItemTagDictationAlternative; #if ENABLE(INSPECTOR) case kWKContextMenuItemTagInspectElement: return WebCore::ContextMenuItemTagInspectElement; |