Title: [123361] trunk/Source/WebKit/chromium
- Revision
- 123361
- Author
- [email protected]
- Date
- 2012-07-23 12:31:38 -0700 (Mon, 23 Jul 2012)
Log Message
Add WebTextInputType enum values for text areas and
content-editable.
https://bugs.webkit.org/show_bug.cgi?id=91654
Reviewed by Adam Barth.
No new tests, no behavior change without corresponding chromium.org changes.
* public/WebTextInputType.h:
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::textInputType):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (123360 => 123361)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-23 19:26:45 UTC (rev 123360)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-23 19:31:38 UTC (rev 123361)
@@ -1,3 +1,17 @@
+2012-07-23 Nate Chapin <[email protected]>
+
+ Add WebTextInputType enum values for text areas and
+ content-editable.
+ https://bugs.webkit.org/show_bug.cgi?id=91654
+
+ Reviewed by Adam Barth.
+
+ No new tests, no behavior change without corresponding chromium.org changes.
+
+ * public/WebTextInputType.h:
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::textInputType):
+
2012-07-23 Pierre Rossi <[email protected]>
Unify numTouchEventHandlersChanged and needTouchEvents in the chrome client
Modified: trunk/Source/WebKit/chromium/public/WebTextInputType.h (123360 => 123361)
--- trunk/Source/WebKit/chromium/public/WebTextInputType.h 2012-07-23 19:26:45 UTC (rev 123360)
+++ trunk/Source/WebKit/chromium/public/WebTextInputType.h 2012-07-23 19:31:38 UTC (rev 123361)
@@ -54,6 +54,10 @@
WebTextInputTypeMonth,
WebTextInputTypeTime,
WebTextInputTypeWeek,
+ WebTextInputTypeTextArea,
+
+ // Input caret is in a contenteditable node (not an INPUT field).
+ WebTextInputTypeContentEditable,
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (123360 => 123361)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-07-23 19:26:45 UTC (rev 123360)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-07-23 19:31:38 UTC (rev 123361)
@@ -2100,11 +2100,11 @@
if (textarea->readOnly() || textarea->disabled())
return WebTextInputTypeNone;
- return WebTextInputTypeText;
+ return WebTextInputTypeTextArea;
}
if (node->shouldUseInputMethod())
- return WebTextInputTypeText;
+ return WebTextInputTypeContentEditable;
return WebTextInputTypeNone;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
