Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / public / web / WebContextMenuData.h

diff --git a/src/third_party/WebKit/public/web/WebContextMenuData.h b/src/third_party/WebKit/public/web/WebContextMenuData.h
index 8c8459d..09cb0f4 100644 (file)
--- a/src/third_party/WebKit/public/web/WebContextMenuData.h
+++ b/src/third_party/WebKit/public/web/WebContextMenuData.h
@@ -55,10 +55,13 @@ struct WebContextMenuData {
         MediaTypeVideo,
         // An audio node is selected.
         MediaTypeAudio,
+        // A canvas node is selected.
+        MediaTypeCanvas,
         // A file node is selected.
         MediaTypeFile,
         // A plugin node is selected.
         MediaTypePlugin,
+        MediaTypeLast = MediaTypePlugin
     };
     // The type of media the context menu is being invoked on.
     MediaType mediaType;
@@ -99,7 +102,7 @@ struct WebContextMenuData {
         MediaLoop = 0x8,
         MediaCanSave = 0x10,
         MediaHasAudio = 0x20,
-        MediaHasVideo = 0x40,
+        MediaCanToggleControls = 0x40,
         MediaControls = 0x80,
         MediaCanPrint = 0x100,
         MediaCanRotate = 0x200,
@@ -111,9 +114,6 @@ struct WebContextMenuData {
     // The raw text of the selection in context.
     WebString selectedText;
 
-    // Whether speech input is enabled.
-    bool isSpeechInputEnabled;
-
     // Whether spell checking is enabled.
     bool isSpellCheckingEnabled;
 
@@ -172,7 +172,6 @@ struct WebContextMenuData {
         : mediaType(MediaTypeNone)
         , hasImageContents(true)
         , mediaFlags(MediaNone)
-        , isSpeechInputEnabled(false)
         , isSpellCheckingEnabled(false)
         , isEditable(false)
         , writingDirectionDefault(CheckableMenuItemDisabled)