Unreviewed, rolling out r123036.

idealisms · idealisms · commit 91e09aae8bdb · 2012-07-19T17:17:24.000Z
http://trac.webkit.org/changeset/123036 https://bugs.webkit.org/show_bug.cgi?id=91555 Triggers some DCHECKs in Chromium browser_tests * public/WebTextInputType.h: * src/WebViewImpl.cpp: (WebKit::WebViewImpl::textInputType): Canonical link: https://commits.webkit.org/109578@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@123120 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2012-07-19  Tony Chang  <tony@chromium.org>
+
+        Unreviewed, rolling out r123036.
+        http://trac.webkit.org/changeset/123036
+        https://bugs.webkit.org/show_bug.cgi?id=91555
+
+        Triggers some DCHECKs in Chromium browser_tests
+
+        * public/WebTextInputType.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::textInputType):
+
 2012-07-19  Joshua Bell  <jsbell@chromium.org>
 
         Roll out r121610 and r122487 which may have been causing flaky crashes
diff --git a/Source/WebKit/chromium/public/WebTextInputType.h b/Source/WebKit/chromium/public/WebTextInputType.h
@@ -54,10 +54,6 @@ enum WebTextInputType {
     WebTextInputTypeMonth,
     WebTextInputTypeTime,
     WebTextInputTypeWeek,
-    WebTextInputTypeTextArea,
-
-    // Input caret is in a contenteditable node (not an INPUT field).
-    WebTextInputTypeContentEditable,
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -2071,11 +2071,11 @@ WebTextInputType WebViewImpl::textInputType()
         if (textarea->readOnly() || textarea->disabled())
             return WebTextInputTypeNone;
 
-        return WebTextInputTypeTextArea;
+        return WebTextInputTypeText;
     }
 
     if (node->shouldUseInputMethod())
-        return WebTextInputTypeContentEditable;
+        return WebTextInputTypeText;
 
     return WebTextInputTypeNone;
 }

Original file line number	Diff line number	Diff line change
`@@ -2071,11 +2071,11 @@ WebTextInputType WebViewImpl::textInputType()`
`2071`	`2071`	`if (textarea->readOnly() \|\| textarea->disabled())`
`2072`	`2072`	`return WebTextInputTypeNone;`
`2073`	`2073`
`2074`		`- return WebTextInputTypeTextArea;`
	`2074`	`+ return WebTextInputTypeText;`
`2075`	`2075`	`}`
`2076`	`2076`
`2077`	`2077`	`if (node->shouldUseInputMethod())`
`2078`		`- return WebTextInputTypeContentEditable;`
	`2078`	`+ return WebTextInputTypeText;`
`2079`	`2079`
`2080`	`2080`	`return WebTextInputTypeNone;`
`2081`	`2081`	`}`