diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 13:15:18 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 13:15:18 +0000 |
| commit | caf38ede8257f27ad8beacf030fdd5f52fb4fc8d (patch) | |
| tree | fd5afec09d4eb7e70c93a6576d17826dc0105d7e /content | |
| parent | 433902586dfdde42550da6f7421708361220df8e (diff) | |
| download | chromium_src-caf38ede8257f27ad8beacf030fdd5f52fb4fc8d.zip chromium_src-caf38ede8257f27ad8beacf030fdd5f52fb4fc8d.tar.gz chromium_src-caf38ede8257f27ad8beacf030fdd5f52fb4fc8d.tar.bz2 | |
Roll WebKit 91883:91912.
Also add new enum values corresponding to:
http://trac.webkit.org/changeset/91892.
Keeping the enums in sync prevents several chromium tests from DCHECK()ing.
TBR=enne@chromium.org,penghuang@chromium.org
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7523028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/render_widget.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 782681e..62695f1 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -1317,12 +1317,22 @@ COMPILE_ASSERT(int(WebKit::WebTextInputTypeText) == \ int(ui::TEXT_INPUT_TYPE_TEXT), mismatching_enums); COMPILE_ASSERT(int(WebKit::WebTextInputTypePassword) == \ int(ui::TEXT_INPUT_TYPE_PASSWORD), mismatching_enums); +COMPILE_ASSERT(int(WebKit::WebTextInputTypeSearch) == \ + int(ui::TEXT_INPUT_TYPE_SEARCH), mismatching_enums); +COMPILE_ASSERT(int(WebKit::WebTextInputTypeEmail) == \ + int(ui::TEXT_INPUT_TYPE_EMAIL), mismatching_enums); +COMPILE_ASSERT(int(WebKit::WebTextInputTypeNumber) == \ + int(ui::TEXT_INPUT_TYPE_NUMBER), mismatching_enums); +COMPILE_ASSERT(int(WebKit::WebTextInputTypeTelephone) == \ + int(ui::TEXT_INPUT_TYPE_TELEPHONE), mismatching_enums); +COMPILE_ASSERT(int(WebKit::WebTextInputTypeURL) == \ + int(ui::TEXT_INPUT_TYPE_URL), mismatching_enums); ui::TextInputType RenderWidget::GetTextInputType() { if (webwidget_) { int type = webwidget_->textInputType(); // Check the type is in the range representable by ui::TextInputType. - DCHECK(type <= ui::TEXT_INPUT_TYPE_PASSWORD) << + DCHECK(type <= ui::TEXT_INPUT_TYPE_URL) << "WebKit::WebTextInputType and ui::TextInputType not synchronized"; return static_cast<ui::TextInputType>(type); } |