Commit d80f2526 authored by estade's avatar estade Committed by Commit bot

Prospective fix for autofill crash

BUG=409349

Review URL: https://codereview.chromium.org/531873002

Cr-Commit-Position: refs/heads/master@{#294448}
parent 8dc7f9c7
...@@ -642,28 +642,28 @@ const size_t kMaxParseableFields = 200; ...@@ -642,28 +642,28 @@ const size_t kMaxParseableFields = 200;
bool IsMonthInput(const WebInputElement* element) { bool IsMonthInput(const WebInputElement* element) {
CR_DEFINE_STATIC_LOCAL(WebString, kMonth, ("month")); CR_DEFINE_STATIC_LOCAL(WebString, kMonth, ("month"));
return element && element->formControlType() == kMonth; return element && !element->isNull() && element->formControlType() == kMonth;
} }
// All text fields, including password fields, should be extracted. // All text fields, including password fields, should be extracted.
bool IsTextInput(const WebInputElement* element) { bool IsTextInput(const WebInputElement* element) {
return element && element->isTextField(); return element && !element->isNull() && element->isTextField();
} }
bool IsSelectElement(const WebFormControlElement& element) { bool IsSelectElement(const WebFormControlElement& element) {
// Static for improved performance. // Static for improved performance.
CR_DEFINE_STATIC_LOCAL(WebString, kSelectOne, ("select-one")); CR_DEFINE_STATIC_LOCAL(WebString, kSelectOne, ("select-one"));
return element.formControlType() == kSelectOne; return !element.isNull() && element.formControlType() == kSelectOne;
} }
bool IsTextAreaElement(const WebFormControlElement& element) { bool IsTextAreaElement(const WebFormControlElement& element) {
// Static for improved performance. // Static for improved performance.
CR_DEFINE_STATIC_LOCAL(WebString, kTextArea, ("textarea")); CR_DEFINE_STATIC_LOCAL(WebString, kTextArea, ("textarea"));
return element.formControlType() == kTextArea; return !element.isNull() && element.formControlType() == kTextArea;
} }
bool IsCheckableElement(const WebInputElement* element) { bool IsCheckableElement(const WebInputElement* element) {
if (!element) if (!element || element->isNull())
return false; return false;
return element->isCheckbox() || element->isRadioButton(); return element->isCheckbox() || element->isRadioButton();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment