Title: [91377] trunk/Source/WebKit/chromium
- Revision
- 91377
- Author
- commit-qu...@webkit.org
- Date
- 2011-07-20 10:01:48 -0700 (Wed, 20 Jul 2011)
Log Message
Bug 64625: Add isSpeechInputEnabled flag to WebContextMenuData.
https://bugs.webkit.org/show_bug.cgi?id=64625
Patch by Glen Shires <gshi...@google.com> on 2011-07-20
Reviewed by Darin Fisher.
* public/WebContextMenuData.h:
(WebKit::WebContextMenuData::WebContextMenuData): added flag isSpeechInputEnabled
* src/ContextMenuClientImpl.cpp:
(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): set flag isSpeechInputEnabled
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (91376 => 91377)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-20 16:52:13 UTC (rev 91376)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-20 17:01:48 UTC (rev 91377)
@@ -1,3 +1,15 @@
+2011-07-20 Glen Shires <gshi...@google.com>
+
+ Bug 64625: Add isSpeechInputEnabled flag to WebContextMenuData.
+ https://bugs.webkit.org/show_bug.cgi?id=64625
+
+ Reviewed by Darin Fisher.
+
+ * public/WebContextMenuData.h:
+ (WebKit::WebContextMenuData::WebContextMenuData): added flag isSpeechInputEnabled
+ * src/ContextMenuClientImpl.cpp:
+ (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): set flag isSpeechInputEnabled
+
2011-07-20 Andrey Kosyakov <ca...@chromium.org>
Web Inspector: move Network log view to an iframe
Modified: trunk/Source/WebKit/chromium/public/WebContextMenuData.h (91376 => 91377)
--- trunk/Source/WebKit/chromium/public/WebContextMenuData.h 2011-07-20 16:52:13 UTC (rev 91376)
+++ trunk/Source/WebKit/chromium/public/WebContextMenuData.h 2011-07-20 17:01:48 UTC (rev 91377)
@@ -109,6 +109,9 @@
// The raw text of the selection in context.
WebString selectedText;
+ // Whether speech input is enabled.
+ bool isSpeechInputEnabled;
+
// Whether spell checking is enabled.
bool isSpellCheckingEnabled;
@@ -162,6 +165,7 @@
: mediaType(MediaTypeNone)
, isImageBlocked(false)
, mediaFlags(MediaNone)
+ , isSpeechInputEnabled(false)
, isSpellCheckingEnabled(false)
, isEditable(false)
, writingDirectionDefault(CheckableMenuItemDisabled)
Modified: trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp (91376 => 91377)
--- trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2011-07-20 16:52:13 UTC (rev 91376)
+++ trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2011-07-20 17:01:48 UTC (rev 91377)
@@ -259,6 +259,12 @@
if (r.isContentEditable()) {
data.isEditable = true;
+#if ENABLE(INPUT_SPEECH)
+ if (r.innerNonSharedNode()->hasTagName(HTMLNames::inputTag)) {
+ data.isSpeechInputEnabled =
+ static_cast<HTMLInputElement*>(r.innerNonSharedNode())->isSpeechEnabled();
+ }
+#endif
if (m_webView->focusedWebCoreFrame()->editor()->isContinuousSpellCheckingEnabled()) {
data.isSpellCheckingEnabled = true;
// Spellchecking might be enabled for the field, but could be disabled on the node.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
