2010-09-21 Kent Tamura <tkent@chromium.org>
authortkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Sep 2010 03:45:35 +0000 (03:45 +0000)
committertkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Sep 2010 03:45:35 +0000 (03:45 +0000)
        Reviewed by David Levin.

        [Chromium] Remove WebInputElement::InputType and inputType()
        https://bugs.webkit.org/show_bug.cgi?id=46238

        * DEPS: Roll Chromium revision to 60132, which removed all usage of inputType().
        * public/WebInputElement.h: Remove InputType and inputType().
        * src/AssertMatchingEnums.cpp: Remove WebInputElement::InputType -
          HTMLInputElement::InputType matching tests.
        * src/WebInputElement.cpp: Remove inputType().

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@68012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/chromium/ChangeLog
WebKit/chromium/DEPS
WebKit/chromium/public/WebInputElement.h
WebKit/chromium/src/AssertMatchingEnums.cpp
WebKit/chromium/src/WebInputElement.cpp

index 1971f4e..dff8ae6 100644 (file)
@@ -1,3 +1,16 @@
+2010-09-21  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] Remove WebInputElement::InputType and inputType()
+        https://bugs.webkit.org/show_bug.cgi?id=46238
+
+        * DEPS: Roll Chromium revision to 60132, which removed all usage of inputType().
+        * public/WebInputElement.h: Remove InputType and inputType().
+        * src/AssertMatchingEnums.cpp: Remove WebInputElement::InputType -
+          HTMLInputElement::InputType matching tests.
+        * src/WebInputElement.cpp: Remove inputType().
+
 2010-09-21  Andrew Wilson  <atwilson@chromium.org>
 
         Unreviewed, rolling out r67982.
index fb8d578..565e7ae 100644 (file)
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '60113',
+  'chromium_rev': '60132',
 }
 
 deps = {
index 3ef92de..8fea4fa 100644 (file)
@@ -52,33 +52,6 @@ namespace WebKit {
         }
         WEBKIT_API void assign(const WebInputElement& e) { WebFormControlElement::assign(e); }
 
-        enum InputType {
-            Text = 0,
-            Password,
-            IsIndex,
-            CheckBox,
-            Radio,
-            Submit,
-            Reset,
-            File,
-            Hidden,
-            Image,
-            Button,
-            Search,
-            Range,
-            Email,
-            Number,
-            Telephone,
-            URL,
-            Color,
-            Date,
-            DateTime,
-            DateTimeLocal,
-            Month,
-            Time,
-            Week
-        };
-
         // This returns true for all of textfield-looking types such as text,
         // password, search, email, url, and number.
         WEBKIT_API bool isTextField() const;
@@ -89,8 +62,6 @@ namespace WebKit {
         WEBKIT_API bool autoComplete() const;
         WEBKIT_API bool isReadOnly() const;
         WEBKIT_API bool isEnabledFormControl() const;
-        // Deperated.
-        WEBKIT_API InputType inputType() const;
         WEBKIT_API int maxLength() const;
         WEBKIT_API bool isActivatedSubmit() const;
         WEBKIT_API void setActivatedSubmit(bool);
index ac3aad3..c04fbf1 100644 (file)
@@ -273,31 +273,6 @@ COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::Weight900, FontWeight900);
 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::WeightNormal, FontWeightNormal);
 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::WeightBold, FontWeightBold);
 
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Text, HTMLInputElement::TEXT);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Password, HTMLInputElement::PASSWORD);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::IsIndex, HTMLInputElement::ISINDEX);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::CheckBox, HTMLInputElement::CHECKBOX);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Radio, HTMLInputElement::RADIO);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Submit, HTMLInputElement::SUBMIT);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Reset, HTMLInputElement::RESET);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::File, HTMLInputElement::FILE);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Hidden, HTMLInputElement::HIDDEN);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Image, HTMLInputElement::IMAGE);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Button, HTMLInputElement::BUTTON);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Search, HTMLInputElement::SEARCH);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Range, HTMLInputElement::RANGE);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Email, HTMLInputElement::EMAIL);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Number, HTMLInputElement::NUMBER);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Telephone, HTMLInputElement::TELEPHONE);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::URL, HTMLInputElement::URL);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Color, HTMLInputElement::COLOR);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Date, HTMLInputElement::DATE);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::DateTime, HTMLInputElement::DATETIME);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::DateTimeLocal, HTMLInputElement::DATETIMELOCAL);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Month, HTMLInputElement::MONTH);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Time, HTMLInputElement::TIME);
-COMPILE_ASSERT_MATCHING_ENUM(WebInputElement::Week, HTMLInputElement::WEEK);
-
 COMPILE_ASSERT_MATCHING_ENUM(WebNode::ElementNode, Node::ELEMENT_NODE);
 COMPILE_ASSERT_MATCHING_ENUM(WebNode::AttributeNode, Node::ATTRIBUTE_NODE);
 COMPILE_ASSERT_MATCHING_ENUM(WebNode::TextNode, Node::TEXT_NODE);
index 25d484c..7779dbc 100644 (file)
@@ -75,11 +75,6 @@ bool WebInputElement::isEnabledFormControl() const
     return constUnwrap<HTMLInputElement>()->isEnabledFormControl();
 }
 
-WebInputElement::InputType WebInputElement::inputType() const
-{
-    return static_cast<InputType>(constUnwrap<HTMLInputElement>()->deprecatedInputType());
-}
-
 int WebInputElement::maxLength() const
 {
     return constUnwrap<HTMLInputElement>()->maxLength();