[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tkent at chromium.org
tkent at chromium.org
Wed Dec 22 13:38:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f375c844fb10fc9c130d63b8ebccb86113dfeba5
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 03:45:35 2010 +0000
2010-09-21 Kent Tamura <tkent at 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().
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68012 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1971f4e..dff8ae6 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-21 Kent Tamura <tkent at 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 at chromium.org>
Unreviewed, rolling out r67982.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index fb8d578..565e7ae 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '60113',
+ 'chromium_rev': '60132',
}
deps = {
diff --git a/WebKit/chromium/public/WebInputElement.h b/WebKit/chromium/public/WebInputElement.h
index 3ef92de..8fea4fa 100644
--- a/WebKit/chromium/public/WebInputElement.h
+++ b/WebKit/chromium/public/WebInputElement.h
@@ -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);
diff --git a/WebKit/chromium/src/AssertMatchingEnums.cpp b/WebKit/chromium/src/AssertMatchingEnums.cpp
index ac3aad3..c04fbf1 100644
--- a/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -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);
diff --git a/WebKit/chromium/src/WebInputElement.cpp b/WebKit/chromium/src/WebInputElement.cpp
index 25d484c..7779dbc 100644
--- a/WebKit/chromium/src/WebInputElement.cpp
+++ b/WebKit/chromium/src/WebInputElement.cpp
@@ -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();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list