Rename EqualIgnoringCase*() to DeprecatedEqualIgnoringCase*()
These functions are confusing, and are misused frequently.
BUG=627682
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Review-Url: https://codereview.chromium.org/2811793004
Cr-Commit-Position: refs/heads/master@{#463547}
diff --git a/third_party/WebKit/Source/build/scripts/templates/EventFactory.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/EventFactory.cpp.tmpl
index b552329..28189d1 100644
--- a/third_party/WebKit/Source/build/scripts/templates/EventFactory.cpp.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/EventFactory.cpp.tmpl
@@ -16,7 +16,7 @@
{{namespace}}* {{namespace}}{{suffix}}Factory::Create(ExecutionContext* executionContext, const String& type) {
{% for event in events if event|script_name|create_event_whitelist or event|script_name|create_event_measure_whitelist %}
{% if event|script_name|create_event_whitelist or event|script_name|create_event_measure_whitelist %}
- if (EqualIgnoringCase(type, "{{event|script_name}}"){% if event.RuntimeEnabled %} && RuntimeEnabledFeatures::{{event.RuntimeEnabled|lower_first}}(){% endif %}) {
+ if (DeprecatedEqualIgnoringCase(type, "{{event|script_name}}"){% if event.RuntimeEnabled %} && RuntimeEnabledFeatures::{{event.RuntimeEnabled|lower_first}}(){% endif %}) {
{% else %}
if (type == "{{event|script_name}}"{% if event.RuntimeEnabled %} && RuntimeEnabledFeatures::{{event.RuntimeEnabled|lower_first}}(){% endif %}) {
{% endif %}
diff --git a/third_party/WebKit/Source/core/clipboard/DataTransfer.cpp b/third_party/WebKit/Source/core/clipboard/DataTransfer.cpp
index f4e1d0b..558c0b7e 100644
--- a/third_party/WebKit/Source/core/clipboard/DataTransfer.cpp
+++ b/third_party/WebKit/Source/core/clipboard/DataTransfer.cpp
@@ -449,7 +449,8 @@
for (size_t i = 0; i < data_object_->length(); ++i) {
if (data_object_->Item(i)->Kind() == DataObjectItem::kFileKind) {
Blob* blob = data_object_->Item(i)->GetAsFile();
- if (blob && blob->IsFile() && EqualIgnoringCase(blob->type(), type))
+ if (blob && blob->IsFile() &&
+ DeprecatedEqualIgnoringCase(blob->type(), type))
return true;
}
}
diff --git a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
index c2eeb25..bd7edfd4 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
@@ -102,8 +102,9 @@
bool MediaQueryEvaluator::MediaTypeMatch(
const String& media_type_to_match) const {
return media_type_to_match.IsEmpty() ||
- EqualIgnoringCase(media_type_to_match, MediaTypeNames::all) ||
- EqualIgnoringCase(media_type_to_match, MediaType());
+ DeprecatedEqualIgnoringCase(media_type_to_match,
+ MediaTypeNames::all) ||
+ DeprecatedEqualIgnoringCase(media_type_to_match, MediaType());
}
static bool ApplyRestrictor(MediaQuery::RestrictorType r, bool value) {
@@ -330,10 +331,11 @@
// this method only got called if this media type matches the one defined
// in the query. Thus, if if the document's media type is "print", the
// media type of the query will either be "print" or "all".
- if (EqualIgnoringCase(media_values.MediaType(), MediaTypeNames::screen)) {
+ if (DeprecatedEqualIgnoringCase(media_values.MediaType(),
+ MediaTypeNames::screen)) {
actual_resolution = clampTo<float>(media_values.DevicePixelRatio());
- } else if (EqualIgnoringCase(media_values.MediaType(),
- MediaTypeNames::print)) {
+ } else if (DeprecatedEqualIgnoringCase(media_values.MediaType(),
+ MediaTypeNames::print)) {
// The resolution of images while printing should not depend on the DPI
// of the screen. Until we support proper ways of querying this info
// we use 300px which is considered minimum for current printers.
@@ -739,7 +741,8 @@
MediaFeaturePrefix,
const MediaValues& media_values) {
// Scan only applies to 'tv' media.
- if (!EqualIgnoringCase(media_values.MediaType(), MediaTypeNames::tv))
+ if (!DeprecatedEqualIgnoringCase(media_values.MediaType(),
+ MediaTypeNames::tv))
return false;
if (!value.IsValid())
diff --git a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
index 29066a37..ecb2c85d 100644
--- a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
+++ b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
@@ -244,7 +244,7 @@
if (!property_id)
return;
- bool important = EqualIgnoringCase(priority, "important");
+ bool important = DeprecatedEqualIgnoringCase(priority, "important");
if (!important && !priority.IsEmpty())
return;
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
index 3d8ea3d..c25dc30 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -2009,7 +2009,7 @@
if (FrameView* view = GetDocument().View()) {
bool was_print = print_media_type_;
print_media_type_ =
- EqualIgnoringCase(view->MediaType(), MediaTypeNames::print);
+ DeprecatedEqualIgnoringCase(view->MediaType(), MediaTypeNames::print);
if (was_print != print_media_type_)
matched_properties_cache_.ClearViewportDependent();
}
diff --git a/third_party/WebKit/Source/core/dom/AttributeCollection.h b/third_party/WebKit/Source/core/dom/AttributeCollection.h
index ddf40ee..30f1cb59 100644
--- a/third_party/WebKit/Source/core/dom/AttributeCollection.h
+++ b/third_party/WebKit/Source/core/dom/AttributeCollection.h
@@ -204,7 +204,7 @@
// and all HTML/SVG attributes have a null namespace!
if (!it->GetName().HasPrefix()) {
if (should_ignore_attribute_case &&
- EqualIgnoringCase(name, it->LocalName()))
+ DeprecatedEqualIgnoringCase(name, it->LocalName()))
return index;
} else {
// FIXME: Would be faster to do this comparison without calling toString,
diff --git a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
index ad9ccd337..5608b02a 100644
--- a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
+++ b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
@@ -32,7 +32,7 @@
static uint32_t CompositorMutablePropertyForName(const String& attribute_name) {
for (const auto& mapping : kAllowedProperties) {
- if (EqualIgnoringCase(mapping.name, attribute_name))
+ if (DeprecatedEqualIgnoringCase(mapping.name, attribute_name))
return mapping.property;
}
return CompositorMutableProperty::kNone;
diff --git a/third_party/WebKit/Source/core/dom/DOMImplementation.cpp b/third_party/WebKit/Source/core/dom/DOMImplementation.cpp
index 110064e..38f1ca3 100644
--- a/third_party/WebKit/Source/core/dom/DOMImplementation.cpp
+++ b/third_party/WebKit/Source/core/dom/DOMImplementation.cpp
@@ -113,9 +113,9 @@
}
bool DOMImplementation::IsXMLMIMEType(const String& mime_type) {
- if (EqualIgnoringCase(mime_type, "text/xml") ||
- EqualIgnoringCase(mime_type, "application/xml") ||
- EqualIgnoringCase(mime_type, "text/xsl"))
+ if (DeprecatedEqualIgnoringCase(mime_type, "text/xml") ||
+ DeprecatedEqualIgnoringCase(mime_type, "application/xml") ||
+ DeprecatedEqualIgnoringCase(mime_type, "text/xsl"))
return true;
// Per RFCs 3023 and 2045, an XML MIME type is of the form:
@@ -191,9 +191,9 @@
static bool IsTextPlainType(const String& mime_type) {
return mime_type.StartsWith("text/", kTextCaseASCIIInsensitive) &&
- !(EqualIgnoringCase(mime_type, "text/html") ||
- EqualIgnoringCase(mime_type, "text/xml") ||
- EqualIgnoringCase(mime_type, "text/xsl"));
+ !(DeprecatedEqualIgnoringCase(mime_type, "text/html") ||
+ DeprecatedEqualIgnoringCase(mime_type, "text/xml") ||
+ DeprecatedEqualIgnoringCase(mime_type, "text/xsl"));
}
bool DOMImplementation::IsTextMIMEType(const String& mime_type) {
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index a465d2cd..2f287b3 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -4529,7 +4529,7 @@
if (event) {
// createEvent for TouchEvent should throw DOM exception if touch event
// feature detection is not enabled. See crbug.com/392584#c22
- if (EqualIgnoringCase(event_type, "TouchEvent") &&
+ if (DeprecatedEqualIgnoringCase(event_type, "TouchEvent") &&
!RuntimeEnabledFeatures::touchEventFeatureDetectionEnabled())
break;
return event;
@@ -5144,8 +5144,9 @@
Traversal<HTMLLinkElement>::FirstChild(*head());
link_element;
link_element = Traversal<HTMLLinkElement>::NextSibling(*link_element)) {
- if (!EqualIgnoringCase(link_element->GetType(), kOpenSearchMIMEType) ||
- !EqualIgnoringCase(link_element->Rel(), kOpenSearchRelation))
+ if (!DeprecatedEqualIgnoringCase(link_element->GetType(),
+ kOpenSearchMIMEType) ||
+ !DeprecatedEqualIgnoringCase(link_element->Rel(), kOpenSearchRelation))
continue;
if (link_element->Href().IsEmpty())
continue;
@@ -5198,10 +5199,10 @@
void Document::setDesignMode(const String& value) {
bool new_value = design_mode_;
- if (EqualIgnoringCase(value, "on")) {
+ if (DeprecatedEqualIgnoringCase(value, "on")) {
new_value = true;
UseCounter::Count(*this, UseCounter::kDocumentDesignModeEnabeld);
- } else if (EqualIgnoringCase(value, "off")) {
+ } else if (DeprecatedEqualIgnoringCase(value, "off")) {
new_value = false;
}
if (new_value == design_mode_)
@@ -5469,7 +5470,7 @@
for (HTMLMetaElement& meta_element :
Traversal<HTMLMetaElement>::DescendantsOf(*root_element)) {
Color color = Color::kTransparent;
- if (EqualIgnoringCase(meta_element.GetName(), "theme-color") &&
+ if (DeprecatedEqualIgnoringCase(meta_element.GetName(), "theme-color") &&
CSSParser::ParseColor(
color, meta_element.Content().GetString().StripWhiteSpace(), true))
return color;
@@ -5795,7 +5796,7 @@
void Document::ParseDNSPrefetchControlHeader(
const String& dns_prefetch_control) {
- if (EqualIgnoringCase(dns_prefetch_control, "on") &&
+ if (DeprecatedEqualIgnoringCase(dns_prefetch_control, "on") &&
!have_explicitly_disabled_dns_prefetch_) {
is_dns_prefetch_enabled_ = true;
return;
diff --git a/third_party/WebKit/Source/core/dom/DocumentStatisticsCollector.cpp b/third_party/WebKit/Source/core/dom/DocumentStatisticsCollector.cpp
index 7c1e83d..7264792 100644
--- a/third_party/WebKit/Source/core/dom/DocumentStatisticsCollector.cpp
+++ b/third_party/WebKit/Source/core/dom/DocumentStatisticsCollector.cpp
@@ -174,7 +174,7 @@
if (meta.GetName() == og_type ||
meta.getAttribute(property_attr) == og_type) {
- if (EqualIgnoringCase(meta.Content(), "article")) {
+ if (DeprecatedEqualIgnoringCase(meta.Content(), "article")) {
return true;
}
}
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index 30353d64..a2390f6 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -2949,7 +2949,7 @@
Node* Element::InsertAdjacent(const String& where,
Node* new_child,
ExceptionState& exception_state) {
- if (EqualIgnoringCase(where, "beforeBegin")) {
+ if (DeprecatedEqualIgnoringCase(where, "beforeBegin")) {
if (ContainerNode* parent = this->parentNode()) {
parent->InsertBefore(new_child, this, exception_state);
if (!exception_state.HadException())
@@ -2958,17 +2958,17 @@
return nullptr;
}
- if (EqualIgnoringCase(where, "afterBegin")) {
+ if (DeprecatedEqualIgnoringCase(where, "afterBegin")) {
InsertBefore(new_child, FirstChild(), exception_state);
return exception_state.HadException() ? nullptr : new_child;
}
- if (EqualIgnoringCase(where, "beforeEnd")) {
+ if (DeprecatedEqualIgnoringCase(where, "beforeEnd")) {
AppendChild(new_child, exception_state);
return exception_state.HadException() ? nullptr : new_child;
}
- if (EqualIgnoringCase(where, "afterEnd")) {
+ if (DeprecatedEqualIgnoringCase(where, "afterEnd")) {
if (ContainerNode* parent = this->parentNode()) {
parent->InsertBefore(new_child, nextSibling(), exception_state);
if (!exception_state.HadException())
@@ -3017,8 +3017,8 @@
static Element* ContextElementForInsertion(const String& where,
Element* element,
ExceptionState& exception_state) {
- if (EqualIgnoringCase(where, "beforeBegin") ||
- EqualIgnoringCase(where, "afterEnd")) {
+ if (DeprecatedEqualIgnoringCase(where, "beforeBegin") ||
+ DeprecatedEqualIgnoringCase(where, "afterEnd")) {
Element* parent = element->parentElement();
if (!parent) {
exception_state.ThrowDOMException(kNoModificationAllowedError,
@@ -3027,8 +3027,8 @@
}
return parent;
}
- if (EqualIgnoringCase(where, "afterBegin") ||
- EqualIgnoringCase(where, "beforeEnd"))
+ if (DeprecatedEqualIgnoringCase(where, "afterBegin") ||
+ DeprecatedEqualIgnoringCase(where, "beforeEnd"))
return element;
exception_state.ThrowDOMException(
kSyntaxError, "The value provided ('" + where +
@@ -3661,9 +3661,10 @@
const AtomicString& value = FastGetAttribute(spellcheckAttr);
if (value == g_null_atom)
return kSpellcheckAttributeDefault;
- if (EqualIgnoringCase(value, "true") || EqualIgnoringCase(value, ""))
+ if (DeprecatedEqualIgnoringCase(value, "true") ||
+ DeprecatedEqualIgnoringCase(value, ""))
return kSpellcheckAttributeTrue;
- if (EqualIgnoringCase(value, "false"))
+ if (DeprecatedEqualIgnoringCase(value, "false"))
return kSpellcheckAttributeFalse;
return kSpellcheckAttributeDefault;
diff --git a/third_party/WebKit/Source/core/dom/SandboxFlags.cpp b/third_party/WebKit/Source/core/dom/SandboxFlags.cpp
index 12816e5a..cca7772 100644
--- a/third_party/WebKit/Source/core/dom/SandboxFlags.cpp
+++ b/third_party/WebKit/Source/core/dom/SandboxFlags.cpp
@@ -45,30 +45,34 @@
for (unsigned index = 0; index < length; index++) {
// Turn off the corresponding sandbox flag if it's set as "allowed".
String sandbox_token(policy[index]);
- if (EqualIgnoringCase(sandbox_token, "allow-same-origin")) {
+ if (DeprecatedEqualIgnoringCase(sandbox_token, "allow-same-origin")) {
flags &= ~kSandboxOrigin;
- } else if (EqualIgnoringCase(sandbox_token, "allow-forms")) {
+ } else if (DeprecatedEqualIgnoringCase(sandbox_token, "allow-forms")) {
flags &= ~kSandboxForms;
- } else if (EqualIgnoringCase(sandbox_token, "allow-scripts")) {
+ } else if (DeprecatedEqualIgnoringCase(sandbox_token, "allow-scripts")) {
flags &= ~kSandboxScripts;
flags &= ~kSandboxAutomaticFeatures;
- } else if (EqualIgnoringCase(sandbox_token, "allow-top-navigation")) {
+ } else if (DeprecatedEqualIgnoringCase(sandbox_token,
+ "allow-top-navigation")) {
flags &= ~kSandboxTopNavigation;
- } else if (EqualIgnoringCase(sandbox_token, "allow-popups")) {
+ } else if (DeprecatedEqualIgnoringCase(sandbox_token, "allow-popups")) {
flags &= ~kSandboxPopups;
- } else if (EqualIgnoringCase(sandbox_token, "allow-pointer-lock")) {
+ } else if (DeprecatedEqualIgnoringCase(sandbox_token,
+ "allow-pointer-lock")) {
flags &= ~kSandboxPointerLock;
- } else if (EqualIgnoringCase(sandbox_token, "allow-orientation-lock")) {
+ } else if (DeprecatedEqualIgnoringCase(sandbox_token,
+ "allow-orientation-lock")) {
flags &= ~kSandboxOrientationLock;
- } else if (EqualIgnoringCase(sandbox_token,
- "allow-popups-to-escape-sandbox")) {
+ } else if (DeprecatedEqualIgnoringCase(sandbox_token,
+ "allow-popups-to-escape-sandbox")) {
flags &= ~kSandboxPropagatesToAuxiliaryBrowsingContexts;
- } else if (EqualIgnoringCase(sandbox_token, "allow-modals")) {
+ } else if (DeprecatedEqualIgnoringCase(sandbox_token, "allow-modals")) {
flags &= ~kSandboxModals;
- } else if (EqualIgnoringCase(sandbox_token, "allow-presentation")) {
+ } else if (DeprecatedEqualIgnoringCase(sandbox_token,
+ "allow-presentation")) {
flags &= ~kSandboxPresentation;
- } else if (EqualIgnoringCase(sandbox_token,
- "allow-top-navigation-by-user-activation") &&
+ } else if (DeprecatedEqualIgnoringCase(
+ sandbox_token, "allow-top-navigation-by-user-activation") &&
RuntimeEnabledFeatures::
topNavByUserActivationInSandboxEnabled()) {
flags &= ~kSandboxTopNavigationByUserActivation;
diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp
index 67f55ced..4622be44 100644
--- a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp
@@ -838,14 +838,14 @@
// 4. "If for is not an ASCII case-insensitive match for the string
// "window",
// then abort these steps at this point. The script is not executed."
- if (!EqualIgnoringCase(for_attribute, "window"))
+ if (!DeprecatedEqualIgnoringCase(for_attribute, "window"))
return false;
event_attribute = event_attribute.StripWhiteSpace();
// 5. "If event is not an ASCII case-insensitive match for either the
// string "onload" or the string "onload()",
// then abort these steps at this point. The script is not executed.
- return EqualIgnoringCase(event_attribute, "onload") ||
- EqualIgnoringCase(event_attribute, "onload()");
+ return DeprecatedEqualIgnoringCase(event_attribute, "onload") ||
+ DeprecatedEqualIgnoringCase(event_attribute, "onload()");
}
String ScriptLoader::ScriptContent() const {
diff --git a/third_party/WebKit/Source/core/dom/StyleElement.cpp b/third_party/WebKit/Source/core/dom/StyleElement.cpp
index a12a197a..5f8bd08 100644
--- a/third_party/WebKit/Source/core/dom/StyleElement.cpp
+++ b/third_party/WebKit/Source/core/dom/StyleElement.cpp
@@ -39,9 +39,9 @@
namespace blink {
static bool IsCSS(const Element& element, const AtomicString& type) {
- return type.IsEmpty() ||
- (element.IsHTMLElement() ? EqualIgnoringCase(type, "text/css")
- : (type == "text/css"));
+ return type.IsEmpty() || (element.IsHTMLElement()
+ ? DeprecatedEqualIgnoringCase(type, "text/css")
+ : (type == "text/css"));
}
StyleElement::StyleElement(Document* document, bool created_by_parser)
diff --git a/third_party/WebKit/Source/core/dom/TreeScope.cpp b/third_party/WebKit/Source/core/dom/TreeScope.cpp
index 3128ab9..f71ab868 100644
--- a/third_party/WebKit/Source/core/dom/TreeScope.cpp
+++ b/third_party/WebKit/Source/core/dom/TreeScope.cpp
@@ -333,7 +333,7 @@
Traversal<HTMLAnchorElement>::StartsAfter(RootNode())) {
if (RootNode().GetDocument().InQuirksMode()) {
// Quirks mode, case insensitive comparison of names.
- if (EqualIgnoringCase(anchor.GetName(), name))
+ if (DeprecatedEqualIgnoringCase(anchor.GetName(), name))
return &anchor;
} else {
// Strict mode, names need to match exactly.
@@ -503,7 +503,8 @@
Element* result = nullptr;
Node& root = RootNode();
for (Element& element : ElementTraversal::DescendantsOf(root)) {
- if (EqualIgnoringCase(element.FastGetAttribute(accesskeyAttr), key))
+ if (DeprecatedEqualIgnoringCase(element.FastGetAttribute(accesskeyAttr),
+ key))
result = &element;
for (ShadowRoot* shadow_root = element.YoungestShadowRoot(); shadow_root;
shadow_root = shadow_root->OlderShadowRoot()) {
diff --git a/third_party/WebKit/Source/core/editing/DOMSelection.cpp b/third_party/WebKit/Source/core/editing/DOMSelection.cpp
index 4dd9d83..24e9035 100644
--- a/third_party/WebKit/Source/core/editing/DOMSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/DOMSelection.cpp
@@ -401,43 +401,43 @@
return;
FrameSelection::EAlteration alter;
- if (EqualIgnoringCase(alter_string, "extend"))
+ if (DeprecatedEqualIgnoringCase(alter_string, "extend"))
alter = FrameSelection::kAlterationExtend;
- else if (EqualIgnoringCase(alter_string, "move"))
+ else if (DeprecatedEqualIgnoringCase(alter_string, "move"))
alter = FrameSelection::kAlterationMove;
else
return;
SelectionDirection direction;
- if (EqualIgnoringCase(direction_string, "forward"))
+ if (DeprecatedEqualIgnoringCase(direction_string, "forward"))
direction = kDirectionForward;
- else if (EqualIgnoringCase(direction_string, "backward"))
+ else if (DeprecatedEqualIgnoringCase(direction_string, "backward"))
direction = kDirectionBackward;
- else if (EqualIgnoringCase(direction_string, "left"))
+ else if (DeprecatedEqualIgnoringCase(direction_string, "left"))
direction = kDirectionLeft;
- else if (EqualIgnoringCase(direction_string, "right"))
+ else if (DeprecatedEqualIgnoringCase(direction_string, "right"))
direction = kDirectionRight;
else
return;
TextGranularity granularity;
- if (EqualIgnoringCase(granularity_string, "character"))
+ if (DeprecatedEqualIgnoringCase(granularity_string, "character"))
granularity = kCharacterGranularity;
- else if (EqualIgnoringCase(granularity_string, "word"))
+ else if (DeprecatedEqualIgnoringCase(granularity_string, "word"))
granularity = kWordGranularity;
- else if (EqualIgnoringCase(granularity_string, "sentence"))
+ else if (DeprecatedEqualIgnoringCase(granularity_string, "sentence"))
granularity = kSentenceGranularity;
- else if (EqualIgnoringCase(granularity_string, "line"))
+ else if (DeprecatedEqualIgnoringCase(granularity_string, "line"))
granularity = kLineGranularity;
- else if (EqualIgnoringCase(granularity_string, "paragraph"))
+ else if (DeprecatedEqualIgnoringCase(granularity_string, "paragraph"))
granularity = kParagraphGranularity;
- else if (EqualIgnoringCase(granularity_string, "lineboundary"))
+ else if (DeprecatedEqualIgnoringCase(granularity_string, "lineboundary"))
granularity = kLineBoundary;
- else if (EqualIgnoringCase(granularity_string, "sentenceboundary"))
+ else if (DeprecatedEqualIgnoringCase(granularity_string, "sentenceboundary"))
granularity = kSentenceBoundary;
- else if (EqualIgnoringCase(granularity_string, "paragraphboundary"))
+ else if (DeprecatedEqualIgnoringCase(granularity_string, "paragraphboundary"))
granularity = kParagraphBoundary;
- else if (EqualIgnoringCase(granularity_string, "documentboundary"))
+ else if (DeprecatedEqualIgnoringCase(granularity_string, "documentboundary"))
granularity = kDocumentBoundary;
else
return;
diff --git a/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp b/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp
index c9c5492..533efbb 100644
--- a/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp
@@ -696,10 +696,10 @@
Event*,
EditorCommandSource,
const String& value) {
- if (EqualIgnoringCase(value, "div"))
+ if (DeprecatedEqualIgnoringCase(value, "div"))
frame.GetEditor().SetDefaultParagraphSeparator(
kEditorParagraphSeparatorIsDiv);
- else if (EqualIgnoringCase(value, "p"))
+ else if (DeprecatedEqualIgnoringCase(value, "p"))
frame.GetEditor().SetDefaultParagraphSeparator(
kEditorParagraphSeparatorIsP);
@@ -1823,7 +1823,8 @@
Event*,
EditorCommandSource,
const String& value) {
- frame.GetEditor().SetShouldStyleWithCSS(!EqualIgnoringCase(value, "false"));
+ frame.GetEditor().SetShouldStyleWithCSS(
+ !DeprecatedEqualIgnoringCase(value, "false"));
return true;
}
@@ -1831,7 +1832,8 @@
Event*,
EditorCommandSource,
const String& value) {
- frame.GetEditor().SetShouldStyleWithCSS(EqualIgnoringCase(value, "false"));
+ frame.GetEditor().SetShouldStyleWithCSS(
+ DeprecatedEqualIgnoringCase(value, "false"));
return true;
}
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index f38a80e..ab683ed 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1918,7 +1918,8 @@
// Implement the rule that "" and "top" both mean top of page as in other
// browsers.
- if (!anchor_node && !(name.IsEmpty() || EqualIgnoringCase(name, "top")))
+ if (!anchor_node &&
+ !(name.IsEmpty() || DeprecatedEqualIgnoringCase(name, "top")))
return false;
if (behavior == kUrlFragmentScroll)
diff --git a/third_party/WebKit/Source/core/frame/SmartClip.cpp b/third_party/WebKit/Source/core/frame/SmartClip.cpp
index c5a7d5d..357b3a2a 100644
--- a/third_party/WebKit/Source/core/frame/SmartClip.cpp
+++ b/third_party/WebKit/Source/core/frame/SmartClip.cpp
@@ -171,7 +171,7 @@
IntRect node_rect = node->PixelSnappedBoundingBox();
if (node->IsElementNode() &&
- EqualIgnoringCase(
+ DeprecatedEqualIgnoringCase(
ToElement(node)->FastGetAttribute(HTMLNames::aria_hiddenAttr),
"true")) {
node = NodeTraversal::NextSkippingChildren(*node, root_node);
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
index 21722f6..053ddde 100644
--- a/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp
@@ -1054,9 +1054,9 @@
if (token_begin < position) {
String token = String(token_begin, position - token_begin);
- if (EqualIgnoringCase(token, "script")) {
+ if (DeprecatedEqualIgnoringCase(token, "script")) {
require_sri_for_ |= RequireSRIForToken::kScript;
- } else if (EqualIgnoringCase(token, "style")) {
+ } else if (DeprecatedEqualIgnoringCase(token, "style")) {
require_sri_for_ |= RequireSRIForToken::kStyle;
} else {
if (number_of_token_errors)
diff --git a/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp b/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp
index 6e075efc8..9bcd80a 100644
--- a/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/CSPSource.cpp
@@ -129,8 +129,9 @@
}
bool is_scheme_http; // needed for detecting an upgrade when the port is 0
- is_scheme_http = scheme_.IsEmpty() ? policy_->ProtocolEqualsSelf("http")
- : EqualIgnoringCase("http", scheme_);
+ is_scheme_http = scheme_.IsEmpty()
+ ? policy_->ProtocolEqualsSelf("http")
+ : DeprecatedEqualIgnoringCase("http", scheme_);
if ((port_ == 80 || (port_ == 0 && is_scheme_http)) &&
(port == 443 || (port == 0 && DefaultPortForProtocol(protocol) == 443)))
diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
index d708cfe3..be7f3e81 100644
--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
@@ -1315,11 +1315,11 @@
String message =
"Unrecognized Content-Security-Policy directive '" + name + "'.\n";
MessageLevel level = kErrorMessageLevel;
- if (EqualIgnoringCase(name, kAllow)) {
+ if (DeprecatedEqualIgnoringCase(name, kAllow)) {
message = kAllowMessage;
- } else if (EqualIgnoringCase(name, kOptions)) {
+ } else if (DeprecatedEqualIgnoringCase(name, kOptions)) {
message = kOptionsMessage;
- } else if (EqualIgnoringCase(name, kPolicyURI)) {
+ } else if (DeprecatedEqualIgnoringCase(name, kPolicyURI)) {
message = kPolicyURIMessage;
} else if (GetDirectiveType(name) != DirectiveType::kUndefined) {
message = "The Content-Security-Policy directive '" + name +
@@ -1417,7 +1417,7 @@
String message = "The source list for Content Security Policy directive '" +
directive_name + "' contains an invalid source: '" + source +
"'. It will be ignored.";
- if (EqualIgnoringCase(source, "'none'"))
+ if (DeprecatedEqualIgnoringCase(source, "'none'"))
message = message +
" Note that 'none' has no effect unless it is the only "
"expression in the source list.";
@@ -1470,7 +1470,7 @@
}
bool ContentSecurityPolicy::ProtocolEqualsSelf(const String& protocol) const {
- return EqualIgnoringCase(protocol, self_protocol_);
+ return DeprecatedEqualIgnoringCase(protocol, self_protocol_);
}
const String& ContentSecurityPolicy::GetSelfProtocol() const {
diff --git a/third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp b/third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp
index d39082b..48a671a 100644
--- a/third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/SourceListDirective.cpp
@@ -41,7 +41,8 @@
const UChar* position = begin;
skipWhile<UChar, IsSourceCharacter>(position, end);
- if (!EqualIgnoringCase("'none'", StringView(begin, position - begin)))
+ if (!DeprecatedEqualIgnoringCase("'none'",
+ StringView(begin, position - begin)))
return false;
skipWhile<UChar, IsASCIISpace>(position, end);
@@ -178,7 +179,7 @@
StringView token(begin, end - begin);
- if (EqualIgnoringCase("'none'", token))
+ if (DeprecatedEqualIgnoringCase("'none'", token))
return false;
if (end - begin == 1 && *begin == '*') {
@@ -186,32 +187,32 @@
return true;
}
- if (EqualIgnoringCase("'self'", token)) {
+ if (DeprecatedEqualIgnoringCase("'self'", token)) {
AddSourceSelf();
return true;
}
- if (EqualIgnoringCase("'unsafe-inline'", token)) {
+ if (DeprecatedEqualIgnoringCase("'unsafe-inline'", token)) {
AddSourceUnsafeInline();
return true;
}
- if (EqualIgnoringCase("'unsafe-eval'", token)) {
+ if (DeprecatedEqualIgnoringCase("'unsafe-eval'", token)) {
AddSourceUnsafeEval();
return true;
}
- if (EqualIgnoringCase("'strict-dynamic'", token)) {
+ if (DeprecatedEqualIgnoringCase("'strict-dynamic'", token)) {
AddSourceStrictDynamic();
return true;
}
- if (EqualIgnoringCase("'unsafe-hashed-attributes'", token)) {
+ if (DeprecatedEqualIgnoringCase("'unsafe-hashed-attributes'", token)) {
AddSourceUnsafeHashedAttributes();
return true;
}
- if (EqualIgnoringCase("'report-sample'", token)) {
+ if (DeprecatedEqualIgnoringCase("'report-sample'", token)) {
AddReportSample();
return true;
}
@@ -323,7 +324,7 @@
// TODO(esprehn): Should be StringView(begin, nonceLength).startsWith(prefix).
if (nonce_length <= prefix.length() ||
- !EqualIgnoringCase(prefix, StringView(begin, prefix.length())))
+ !DeprecatedEqualIgnoringCase(prefix, StringView(begin, prefix.length())))
return true;
const UChar* position = begin + prefix.length();
@@ -373,7 +374,8 @@
// TODO(esprehn): Should be StringView(begin, end -
// begin).startsWith(prefix).
if (hash_length > prefix.length() &&
- EqualIgnoringCase(prefix, StringView(begin, prefix.length()))) {
+ DeprecatedEqualIgnoringCase(prefix,
+ StringView(begin, prefix.length()))) {
hash_algorithm = algorithm.type;
break;
}
diff --git a/third_party/WebKit/Source/core/html/CrossOriginAttribute.cpp b/third_party/WebKit/Source/core/html/CrossOriginAttribute.cpp
index c3adb9f..d56a722 100644
--- a/third_party/WebKit/Source/core/html/CrossOriginAttribute.cpp
+++ b/third_party/WebKit/Source/core/html/CrossOriginAttribute.cpp
@@ -9,7 +9,7 @@
CrossOriginAttributeValue GetCrossOriginAttributeValue(const String& value) {
if (value.IsNull())
return kCrossOriginAttributeNotSet;
- if (EqualIgnoringCase(value, "use-credentials"))
+ if (DeprecatedEqualIgnoringCase(value, "use-credentials"))
return kCrossOriginAttributeUseCredentials;
return kCrossOriginAttributeAnonymous;
}
diff --git a/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp b/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp
index aa070a2..1abf5d0 100644
--- a/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLAnchorElement.cpp
@@ -240,9 +240,9 @@
bool HTMLAnchorElement::draggable() const {
// Should be draggable if we have an href attribute.
const AtomicString& value = getAttribute(draggableAttr);
- if (EqualIgnoringCase(value, "true"))
+ if (DeprecatedEqualIgnoringCase(value, "true"))
return true;
- if (EqualIgnoringCase(value, "false"))
+ if (DeprecatedEqualIgnoringCase(value, "false"))
return false;
return hasAttribute(hrefAttr);
}
diff --git a/third_party/WebKit/Source/core/html/HTMLBRElement.cpp b/third_party/WebKit/Source/core/html/HTMLBRElement.cpp
index 76cc5fc..85eed16a 100644
--- a/third_party/WebKit/Source/core/html/HTMLBRElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLBRElement.cpp
@@ -51,7 +51,7 @@
// <br clear> and <br clear=""> are just treated like <br> by Gecko, Mac IE,
// etc. -dwh
if (!value.IsEmpty()) {
- if (EqualIgnoringCase(value, "all"))
+ if (DeprecatedEqualIgnoringCase(value, "all"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyClear,
CSSValueBoth);
else
diff --git a/third_party/WebKit/Source/core/html/HTMLButtonElement.cpp b/third_party/WebKit/Source/core/html/HTMLButtonElement.cpp
index fb3ec665..8df534c 100644
--- a/third_party/WebKit/Source/core/html/HTMLButtonElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLButtonElement.cpp
@@ -88,9 +88,9 @@
void HTMLButtonElement::ParseAttribute(
const AttributeModificationParams& params) {
if (params.name == typeAttr) {
- if (EqualIgnoringCase(params.new_value, "reset"))
+ if (DeprecatedEqualIgnoringCase(params.new_value, "reset"))
type_ = RESET;
- else if (EqualIgnoringCase(params.new_value, "button"))
+ else if (DeprecatedEqualIgnoringCase(params.new_value, "button"))
type_ = BUTTON;
else
type_ = SUBMIT;
diff --git a/third_party/WebKit/Source/core/html/HTMLDivElement.cpp b/third_party/WebKit/Source/core/html/HTMLDivElement.cpp
index 7bac9806..2586970e 100644
--- a/third_party/WebKit/Source/core/html/HTMLDivElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLDivElement.cpp
@@ -40,14 +40,14 @@
const AtomicString& value,
MutableStylePropertySet* style) {
if (name == alignAttr) {
- if (EqualIgnoringCase(value, "middle") ||
- EqualIgnoringCase(value, "center"))
+ if (DeprecatedEqualIgnoringCase(value, "middle") ||
+ DeprecatedEqualIgnoringCase(value, "center"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueWebkitCenter);
- else if (EqualIgnoringCase(value, "left"))
+ else if (DeprecatedEqualIgnoringCase(value, "left"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueWebkitLeft);
- else if (EqualIgnoringCase(value, "right"))
+ else if (DeprecatedEqualIgnoringCase(value, "right"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueWebkitRight);
else
diff --git a/third_party/WebKit/Source/core/html/HTMLElement.cpp b/third_party/WebKit/Source/core/html/HTMLElement.cpp
index a5c665d6..30e18d2 100644
--- a/third_party/WebKit/Source/core/html/HTMLElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLElement.cpp
@@ -205,7 +205,7 @@
first_separator = ui_language.Find('_');
if (first_separator != kNotFound)
ui_language = ui_language.Left(first_separator);
- if (!EqualIgnoringCase(html_language, ui_language))
+ if (!DeprecatedEqualIgnoringCase(html_language, ui_language))
UseCounter::Count(GetDocument(),
UseCounter::kLangAttributeDoesNotMatchToUILocale);
} else {
@@ -224,8 +224,9 @@
}
static inline bool IsValidDirAttribute(const AtomicString& value) {
- return EqualIgnoringCase(value, "auto") || EqualIgnoringCase(value, "ltr") ||
- EqualIgnoringCase(value, "rtl");
+ return DeprecatedEqualIgnoringCase(value, "auto") ||
+ DeprecatedEqualIgnoringCase(value, "ltr") ||
+ DeprecatedEqualIgnoringCase(value, "rtl");
}
void HTMLElement::CollectStyleForPresentationAttribute(
@@ -233,14 +234,14 @@
const AtomicString& value,
MutableStylePropertySet* style) {
if (name == alignAttr) {
- if (EqualIgnoringCase(value, "middle"))
+ if (DeprecatedEqualIgnoringCase(value, "middle"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueCenter);
else
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
value);
} else if (name == contenteditableAttr) {
- if (value.IsEmpty() || EqualIgnoringCase(value, "true")) {
+ if (value.IsEmpty() || DeprecatedEqualIgnoringCase(value, "true")) {
AddPropertyToPresentationAttributeStyle(
style, CSSPropertyWebkitUserModify, CSSValueReadWrite);
AddPropertyToPresentationAttributeStyle(style, CSSPropertyWordWrap,
@@ -251,7 +252,7 @@
if (HasTagName(htmlTag))
UseCounter::Count(GetDocument(),
UseCounter::kContentEditableTrueOnHTML);
- } else if (EqualIgnoringCase(value, "plaintext-only")) {
+ } else if (DeprecatedEqualIgnoringCase(value, "plaintext-only")) {
AddPropertyToPresentationAttributeStyle(
style, CSSPropertyWebkitUserModify, CSSValueReadWritePlaintextOnly);
AddPropertyToPresentationAttributeStyle(style, CSSPropertyWordWrap,
@@ -260,7 +261,7 @@
CSSValueAfterWhiteSpace);
UseCounter::Count(GetDocument(),
UseCounter::kContentEditablePlainTextOnly);
- } else if (EqualIgnoringCase(value, "false")) {
+ } else if (DeprecatedEqualIgnoringCase(value, "false")) {
AddPropertyToPresentationAttributeStyle(
style, CSSPropertyWebkitUserModify, CSSValueReadOnly);
}
@@ -269,17 +270,17 @@
CSSValueNone);
} else if (name == draggableAttr) {
UseCounter::Count(GetDocument(), UseCounter::kDraggableAttribute);
- if (EqualIgnoringCase(value, "true")) {
+ if (DeprecatedEqualIgnoringCase(value, "true")) {
AddPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitUserDrag,
CSSValueElement);
AddPropertyToPresentationAttributeStyle(style, CSSPropertyUserSelect,
CSSValueNone);
- } else if (EqualIgnoringCase(value, "false")) {
+ } else if (DeprecatedEqualIgnoringCase(value, "false")) {
AddPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitUserDrag,
CSSValueNone);
}
} else if (name == dirAttr) {
- if (EqualIgnoringCase(value, "auto")) {
+ if (DeprecatedEqualIgnoringCase(value, "auto")) {
AddPropertyToPresentationAttributeStyle(
style, CSSPropertyUnicodeBidi, UnicodeBidiAttributeForDirAuto(this));
} else {
@@ -591,25 +592,25 @@
CSSValueID float_value = CSSValueInvalid;
CSSValueID vertical_align_value = CSSValueInvalid;
- if (EqualIgnoringCase(alignment, "absmiddle")) {
+ if (DeprecatedEqualIgnoringCase(alignment, "absmiddle")) {
vertical_align_value = CSSValueMiddle;
- } else if (EqualIgnoringCase(alignment, "absbottom")) {
+ } else if (DeprecatedEqualIgnoringCase(alignment, "absbottom")) {
vertical_align_value = CSSValueBottom;
- } else if (EqualIgnoringCase(alignment, "left")) {
+ } else if (DeprecatedEqualIgnoringCase(alignment, "left")) {
float_value = CSSValueLeft;
vertical_align_value = CSSValueTop;
- } else if (EqualIgnoringCase(alignment, "right")) {
+ } else if (DeprecatedEqualIgnoringCase(alignment, "right")) {
float_value = CSSValueRight;
vertical_align_value = CSSValueTop;
- } else if (EqualIgnoringCase(alignment, "top")) {
+ } else if (DeprecatedEqualIgnoringCase(alignment, "top")) {
vertical_align_value = CSSValueTop;
- } else if (EqualIgnoringCase(alignment, "middle")) {
+ } else if (DeprecatedEqualIgnoringCase(alignment, "middle")) {
vertical_align_value = CSSValueWebkitBaselineMiddle;
- } else if (EqualIgnoringCase(alignment, "center")) {
+ } else if (DeprecatedEqualIgnoringCase(alignment, "center")) {
vertical_align_value = CSSValueMiddle;
- } else if (EqualIgnoringCase(alignment, "bottom")) {
+ } else if (DeprecatedEqualIgnoringCase(alignment, "bottom")) {
vertical_align_value = CSSValueBaseline;
- } else if (EqualIgnoringCase(alignment, "texttop")) {
+ } else if (DeprecatedEqualIgnoringCase(alignment, "texttop")) {
vertical_align_value = CSSValueTextTop;
}
@@ -631,11 +632,11 @@
if (value.IsNull())
return "inherit";
- if (value.IsEmpty() || EqualIgnoringCase(value, "true"))
+ if (value.IsEmpty() || DeprecatedEqualIgnoringCase(value, "true"))
return "true";
- if (EqualIgnoringCase(value, "false"))
+ if (DeprecatedEqualIgnoringCase(value, "false"))
return "false";
- if (EqualIgnoringCase(value, "plaintext-only"))
+ if (DeprecatedEqualIgnoringCase(value, "plaintext-only"))
return "plaintext-only";
return "inherit";
@@ -643,13 +644,13 @@
void HTMLElement::setContentEditable(const String& enabled,
ExceptionState& exception_state) {
- if (EqualIgnoringCase(enabled, "true"))
+ if (DeprecatedEqualIgnoringCase(enabled, "true"))
setAttribute(contenteditableAttr, "true");
- else if (EqualIgnoringCase(enabled, "false"))
+ else if (DeprecatedEqualIgnoringCase(enabled, "false"))
setAttribute(contenteditableAttr, "false");
- else if (EqualIgnoringCase(enabled, "plaintext-only"))
+ else if (DeprecatedEqualIgnoringCase(enabled, "plaintext-only"))
setAttribute(contenteditableAttr, "plaintext-only");
- else if (EqualIgnoringCase(enabled, "inherit"))
+ else if (DeprecatedEqualIgnoringCase(enabled, "inherit"))
removeAttribute(contenteditableAttr);
else
exception_state.ThrowDOMException(kSyntaxError,
@@ -663,7 +664,7 @@
}
bool HTMLElement::draggable() const {
- return EqualIgnoringCase(getAttribute(draggableAttr), "true");
+ return DeprecatedEqualIgnoringCase(getAttribute(draggableAttr), "true");
}
void HTMLElement::setDraggable(bool value) {
@@ -703,9 +704,10 @@
if (value == g_null_atom)
return kTranslateAttributeInherit;
- if (EqualIgnoringCase(value, "yes") || EqualIgnoringCase(value, ""))
+ if (DeprecatedEqualIgnoringCase(value, "yes") ||
+ DeprecatedEqualIgnoringCase(value, ""))
return kTranslateAttributeYes;
- if (EqualIgnoringCase(value, "no"))
+ if (DeprecatedEqualIgnoringCase(value, "no"))
return kTranslateAttributeNo;
return kTranslateAttributeInherit;
@@ -740,11 +742,11 @@
DEFINE_STATIC_LOCAL(const AtomicString, rtl_value, ("rtl"));
DEFINE_STATIC_LOCAL(const AtomicString, auto_value, ("auto"));
- if (EqualIgnoringCase(value, ltr_value))
+ if (DeprecatedEqualIgnoringCase(value, ltr_value))
return ltr_value;
- if (EqualIgnoringCase(value, rtl_value))
+ if (DeprecatedEqualIgnoringCase(value, rtl_value))
return rtl_value;
- if (EqualIgnoringCase(value, auto_value))
+ if (DeprecatedEqualIgnoringCase(value, auto_value))
return auto_value;
return g_null_atom;
}
@@ -776,7 +778,7 @@
// https://html.spec.whatwg.org/multipage/semantics.html#the-bdi-element
const AtomicString& direction = FastGetAttribute(dirAttr);
return (isHTMLBDIElement(*this) && direction == g_null_atom) ||
- EqualIgnoringCase(direction, "auto");
+ DeprecatedEqualIgnoringCase(direction, "auto");
}
TextDirection HTMLElement::DirectionalityIfhasDirAutoAttribute(
@@ -804,7 +806,7 @@
Node* node = FlatTreeTraversal::FirstChild(*this);
while (node) {
// Skip bdi, script, style and text form controls.
- if (EqualIgnoringCase(node->nodeName(), "bdi") ||
+ if (DeprecatedEqualIgnoringCase(node->nodeName(), "bdi") ||
isHTMLScriptElement(*node) || isHTMLStyleElement(*node) ||
(node->IsElementNode() && ToElement(node)->IsTextControl()) ||
(node->IsElementNode() &&
@@ -861,7 +863,7 @@
ToHTMLElement(parent)
->AdjustDirectionalityIfNeededAfterChildAttributeChanged(this);
- if (EqualIgnoringCase(value, "auto"))
+ if (DeprecatedEqualIgnoringCase(value, "auto"))
CalculateAndAdjustDirectionality();
}
@@ -1009,7 +1011,7 @@
String color_string = attribute_value.StripWhiteSpace();
// "transparent" doesn't apply a color either.
- if (EqualIgnoringCase(color_string, "transparent"))
+ if (DeprecatedEqualIgnoringCase(color_string, "transparent"))
return false;
// If the string is a 3/6-digit hex color or a named CSS color, use that.
@@ -1106,10 +1108,10 @@
if (FastHasAttribute(contenteditableAttr)) {
const AtomicString& value = FastGetAttribute(contenteditableAttr);
- if (value.IsEmpty() || EqualIgnoringCase(value, "true") ||
- EqualIgnoringCase(value, "plaintext-only"))
+ if (value.IsEmpty() || DeprecatedEqualIgnoringCase(value, "true") ||
+ DeprecatedEqualIgnoringCase(value, "plaintext-only"))
return true;
- if (EqualIgnoringCase(value, "false"))
+ if (DeprecatedEqualIgnoringCase(value, "false"))
return false;
// All other values should be treated as "inherit".
}
diff --git a/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp b/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
index 720401dc..8fb05dc 100644
--- a/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
@@ -81,7 +81,8 @@
const AtomicString& value,
MutableStylePropertySet* style) {
if (name == hiddenAttr) {
- if (EqualIgnoringCase(value, "yes") || EqualIgnoringCase(value, "true")) {
+ if (DeprecatedEqualIgnoringCase(value, "yes") ||
+ DeprecatedEqualIgnoringCase(value, "true")) {
AddPropertyToPresentationAttributeStyle(
style, CSSPropertyWidth, 0, CSSPrimitiveValue::UnitType::kPixels);
AddPropertyToPresentationAttributeStyle(
diff --git a/third_party/WebKit/Source/core/html/HTMLFormElement.cpp b/third_party/WebKit/Source/core/html/HTMLFormElement.cpp
index ce81ebe..d14303a9 100644
--- a/third_party/WebKit/Source/core/html/HTMLFormElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFormElement.cpp
@@ -771,7 +771,8 @@
}
bool HTMLFormElement::ShouldAutocomplete() const {
- return !EqualIgnoringCase(FastGetAttribute(autocompleteAttr), "off");
+ return !DeprecatedEqualIgnoringCase(FastGetAttribute(autocompleteAttr),
+ "off");
}
void HTMLFormElement::FinishParsingChildren() {
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
index ca3bb0fb..6c41556 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
@@ -149,9 +149,10 @@
} else if (name == scrollingAttr) {
// Auto and yes both simply mean "allow scrolling." No means "don't allow
// scrolling."
- if (EqualIgnoringCase(value, "auto") || EqualIgnoringCase(value, "yes"))
+ if (DeprecatedEqualIgnoringCase(value, "auto") ||
+ DeprecatedEqualIgnoringCase(value, "yes"))
SetScrollingMode(kScrollbarAuto);
- else if (EqualIgnoringCase(value, "no"))
+ else if (DeprecatedEqualIgnoringCase(value, "no"))
SetScrollingMode(kScrollbarAlwaysOff);
} else if (name == onbeforeunloadAttr) {
// FIXME: should <frame> elements have beforeunload handlers?
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameSetElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameSetElement.cpp
index ae215b0..ba1fbf4 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameSetElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFrameSetElement.cpp
@@ -88,11 +88,12 @@
}
} else if (name == frameborderAttr) {
if (!value.IsNull()) {
- if (EqualIgnoringCase(value, "no") || EqualIgnoringCase(value, "0")) {
+ if (DeprecatedEqualIgnoringCase(value, "no") ||
+ DeprecatedEqualIgnoringCase(value, "0")) {
frameborder_ = false;
frameborder_set_ = true;
- } else if (EqualIgnoringCase(value, "yes") ||
- EqualIgnoringCase(value, "1")) {
+ } else if (DeprecatedEqualIgnoringCase(value, "yes") ||
+ DeprecatedEqualIgnoringCase(value, "1")) {
frameborder_set_ = true;
}
} else {
diff --git a/third_party/WebKit/Source/core/html/HTMLHRElement.cpp b/third_party/WebKit/Source/core/html/HTMLHRElement.cpp
index adbbe3b..a2fd9af1 100644
--- a/third_party/WebKit/Source/core/html/HTMLHRElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLHRElement.cpp
@@ -52,13 +52,13 @@
const AtomicString& value,
MutableStylePropertySet* style) {
if (name == alignAttr) {
- if (EqualIgnoringCase(value, "left")) {
+ if (DeprecatedEqualIgnoringCase(value, "left")) {
AddPropertyToPresentationAttributeStyle(
style, CSSPropertyMarginLeft, 0,
CSSPrimitiveValue::UnitType::kPixels);
AddPropertyToPresentationAttributeStyle(style, CSSPropertyMarginRight,
CSSValueAuto);
- } else if (EqualIgnoringCase(value, "right")) {
+ } else if (DeprecatedEqualIgnoringCase(value, "right")) {
AddPropertyToPresentationAttributeStyle(style, CSSPropertyMarginLeft,
CSSValueAuto);
AddPropertyToPresentationAttributeStyle(
diff --git a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
index b601f1c..dc56d4c7 100644
--- a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
@@ -555,7 +555,7 @@
bool HTMLImageElement::draggable() const {
// Image elements are draggable by default.
- return !EqualIgnoringCase(getAttribute(draggableAttr), "false");
+ return !DeprecatedEqualIgnoringCase(getAttribute(draggableAttr), "false");
}
void HTMLImageElement::setHeight(unsigned value) {
diff --git a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp
index ffdbb3fa..31abd515 100644
--- a/third_party/WebKit/Source/core/html/HTMLInputElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLInputElement.cpp
@@ -699,7 +699,7 @@
AddToRadioButtonGroup();
TextControlElement::ParseAttribute(params);
} else if (name == autocompleteAttr) {
- if (EqualIgnoringCase(value, "off")) {
+ if (DeprecatedEqualIgnoringCase(value, "off")) {
autocomplete_ = kOff;
} else {
if (value.IsEmpty())
diff --git a/third_party/WebKit/Source/core/html/HTMLLIElement.cpp b/third_party/WebKit/Source/core/html/HTMLLIElement.cpp
index e1bfc1cc..5bb7beb 100644
--- a/third_party/WebKit/Source/core/html/HTMLLIElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLLIElement.cpp
@@ -56,13 +56,13 @@
return CSSValueUpperRoman;
if (value == "1")
return CSSValueDecimal;
- if (EqualIgnoringCase(value, "disc"))
+ if (DeprecatedEqualIgnoringCase(value, "disc"))
return CSSValueDisc;
- if (EqualIgnoringCase(value, "circle"))
+ if (DeprecatedEqualIgnoringCase(value, "circle"))
return CSSValueCircle;
- if (EqualIgnoringCase(value, "square"))
+ if (DeprecatedEqualIgnoringCase(value, "square"))
return CSSValueSquare;
- if (EqualIgnoringCase(value, "none"))
+ if (DeprecatedEqualIgnoringCase(value, "none"))
return CSSValueNone;
return CSSValueInvalid;
}
diff --git a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
index 109d2892..48ca73f 100644
--- a/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLLinkElement.cpp
@@ -322,7 +322,7 @@
const QualifiedName& HTMLLinkElement::SubResourceAttributeName() const {
// If the link element is not css, ignore it.
- if (EqualIgnoringCase(getAttribute(typeAttr), "text/css")) {
+ if (DeprecatedEqualIgnoringCase(getAttribute(typeAttr), "text/css")) {
// FIXME: Add support for extracting links of sub-resources which
// are inside style-sheet such as @import, @font-face, url(), etc.
return hrefAttr;
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
index e200c38..fd0253d4 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.cpp
@@ -2229,7 +2229,7 @@
WebMediaPlayer::Preload HTMLMediaElement::PreloadType() const {
const AtomicString& preload = FastGetAttribute(preloadAttr);
- if (EqualIgnoringCase(preload, "none")) {
+ if (DeprecatedEqualIgnoringCase(preload, "none")) {
UseCounter::Count(GetDocument(), UseCounter::kHTMLMediaElementPreloadNone);
return WebMediaPlayer::kPreloadNone;
}
@@ -2246,7 +2246,7 @@
return WebMediaPlayer::kPreloadNone;
}
- if (EqualIgnoringCase(preload, "metadata")) {
+ if (DeprecatedEqualIgnoringCase(preload, "metadata")) {
UseCounter::Count(GetDocument(),
UseCounter::kHTMLMediaElementPreloadMetadata);
return WebMediaPlayer::kPreloadMetaData;
@@ -2259,7 +2259,7 @@
return WebMediaPlayer::kPreloadMetaData;
}
- if (EqualIgnoringCase(preload, "auto")) {
+ if (DeprecatedEqualIgnoringCase(preload, "auto")) {
UseCounter::Count(GetDocument(), UseCounter::kHTMLMediaElementPreloadAuto);
return WebMediaPlayer::kPreloadAuto;
}
@@ -3864,7 +3864,7 @@
const AtomicString& cross_origin_mode = FastGetAttribute(crossoriginAttr);
if (cross_origin_mode.IsNull())
return WebMediaPlayer::kCORSModeUnspecified;
- if (EqualIgnoringCase(cross_origin_mode, "use-credentials"))
+ if (DeprecatedEqualIgnoringCase(cross_origin_mode, "use-credentials"))
return WebMediaPlayer::kCORSModeUseCredentials;
return WebMediaPlayer::kCORSModeAnonymous;
}
diff --git a/third_party/WebKit/Source/core/html/HTMLMenuItemElement.cpp b/third_party/WebKit/Source/core/html/HTMLMenuItemElement.cpp
index 5bbec3e..20502c4 100644
--- a/third_party/WebKit/Source/core/html/HTMLMenuItemElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMenuItemElement.cpp
@@ -32,12 +32,13 @@
void HTMLMenuItemElement::DefaultEventHandler(Event* event) {
if (event->type() == EventTypeNames::click) {
- if (EqualIgnoringCase(FastGetAttribute(typeAttr), "checkbox")) {
+ if (DeprecatedEqualIgnoringCase(FastGetAttribute(typeAttr), "checkbox")) {
if (FastHasAttribute(checkedAttr))
removeAttribute(checkedAttr);
else
setAttribute(checkedAttr, "checked");
- } else if (EqualIgnoringCase(FastGetAttribute(typeAttr), "radio")) {
+ } else if (DeprecatedEqualIgnoringCase(FastGetAttribute(typeAttr),
+ "radio")) {
if (Element* parent = parentElement()) {
AtomicString group = FastGetAttribute(radiogroupAttr);
for (HTMLMenuItemElement& menu_item :
diff --git a/third_party/WebKit/Source/core/html/HTMLMetaElement.cpp b/third_party/WebKit/Source/core/html/HTMLMetaElement.cpp
index 5f4b37ebc..a583f61c 100644
--- a/third_party/WebKit/Source/core/html/HTMLMetaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLMetaElement.cpp
@@ -182,9 +182,9 @@
// 3) device-width and device-height are used as keywords.
// 4) Other keywords and unknown values translate to 0.0.
- if (EqualIgnoringCase(value_string, "device-width"))
+ if (DeprecatedEqualIgnoringCase(value_string, "device-width"))
return Length(kDeviceWidth);
- if (EqualIgnoringCase(value_string, "device-height"))
+ if (DeprecatedEqualIgnoringCase(value_string, "device-height"))
return Length(kDeviceHeight);
float value =
@@ -210,13 +210,13 @@
// 5) no and unknown values are translated to 0.0
computed_value_matches_parsed_value = false;
- if (EqualIgnoringCase(value_string, "yes"))
+ if (DeprecatedEqualIgnoringCase(value_string, "yes"))
return 1;
- if (EqualIgnoringCase(value_string, "no"))
+ if (DeprecatedEqualIgnoringCase(value_string, "no"))
return 0;
- if (EqualIgnoringCase(value_string, "device-width"))
+ if (DeprecatedEqualIgnoringCase(value_string, "device-width"))
return 10;
- if (EqualIgnoringCase(value_string, "device-height"))
+ if (DeprecatedEqualIgnoringCase(value_string, "device-height"))
return 10;
float value =
@@ -251,17 +251,17 @@
// Numbers in the range <-1, 1>, and unknown values, are mapped to no.
computed_value_matches_parsed_value = false;
- if (EqualIgnoringCase(value_string, "yes")) {
+ if (DeprecatedEqualIgnoringCase(value_string, "yes")) {
computed_value_matches_parsed_value = true;
return true;
}
- if (EqualIgnoringCase(value_string, "no")) {
+ if (DeprecatedEqualIgnoringCase(value_string, "no")) {
computed_value_matches_parsed_value = true;
return false;
}
- if (EqualIgnoringCase(value_string, "device-width"))
+ if (DeprecatedEqualIgnoringCase(value_string, "device-width"))
return true;
- if (EqualIgnoringCase(value_string, "device-height"))
+ if (DeprecatedEqualIgnoringCase(value_string, "device-height"))
return true;
float value =
@@ -276,13 +276,13 @@
bool report_warnings,
const String& key_string,
const String& value_string) {
- if (EqualIgnoringCase(value_string, "device-dpi"))
+ if (DeprecatedEqualIgnoringCase(value_string, "device-dpi"))
return ViewportDescription::kValueDeviceDPI;
- if (EqualIgnoringCase(value_string, "low-dpi"))
+ if (DeprecatedEqualIgnoringCase(value_string, "low-dpi"))
return ViewportDescription::kValueLowDPI;
- if (EqualIgnoringCase(value_string, "medium-dpi"))
+ if (DeprecatedEqualIgnoringCase(value_string, "medium-dpi"))
return ViewportDescription::kValueMediumDPI;
- if (EqualIgnoringCase(value_string, "high-dpi"))
+ if (DeprecatedEqualIgnoringCase(value_string, "high-dpi"))
return ViewportDescription::kValueHighDPI;
bool ok;
@@ -473,21 +473,21 @@
const AtomicString& name_value = FastGetAttribute(nameAttr);
if (!name_value.IsEmpty()) {
- if (EqualIgnoringCase(name_value, "viewport"))
+ if (DeprecatedEqualIgnoringCase(name_value, "viewport"))
ProcessViewportContentAttribute(content_value,
ViewportDescription::kViewportMeta);
- else if (EqualIgnoringCase(name_value, "referrer"))
+ else if (DeprecatedEqualIgnoringCase(name_value, "referrer"))
GetDocument().ParseAndSetReferrerPolicy(
content_value, true /* support legacy keywords */);
- else if (EqualIgnoringCase(name_value, "handheldfriendly") &&
- EqualIgnoringCase(content_value, "true"))
+ else if (DeprecatedEqualIgnoringCase(name_value, "handheldfriendly") &&
+ DeprecatedEqualIgnoringCase(content_value, "true"))
ProcessViewportContentAttribute(
"width=device-width", ViewportDescription::kHandheldFriendlyMeta);
- else if (EqualIgnoringCase(name_value, "mobileoptimized"))
+ else if (DeprecatedEqualIgnoringCase(name_value, "mobileoptimized"))
ProcessViewportContentAttribute(
"width=device-width, initial-scale=1",
ViewportDescription::kMobileOptimizedMeta);
- else if (EqualIgnoringCase(name_value, "theme-color") &&
+ else if (DeprecatedEqualIgnoringCase(name_value, "theme-color") &&
GetDocument().GetFrame())
GetDocument()
.GetFrame()
diff --git a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
index df19edc8..016cc6f 100644
--- a/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLObjectElement.cpp
@@ -133,9 +133,9 @@
// Real and WMP require "src" attribute).
int src_index = -1, data_index = -1;
for (unsigned i = 0; i < param_names->size(); ++i) {
- if (EqualIgnoringCase((*param_names)[i], "src"))
+ if (DeprecatedEqualIgnoringCase((*param_names)[i], "src"))
src_index = i;
- else if (EqualIgnoringCase((*param_names)[i], "data"))
+ else if (DeprecatedEqualIgnoringCase((*param_names)[i], "data"))
data_index = i;
}
@@ -169,12 +169,14 @@
// TODO(schenney): crbug.com/572908 url adjustment does not belong in this
// function.
if (url.IsEmpty() && url_parameter.IsEmpty() &&
- (EqualIgnoringCase(name, "src") || EqualIgnoringCase(name, "movie") ||
- EqualIgnoringCase(name, "code") || EqualIgnoringCase(name, "url")))
+ (DeprecatedEqualIgnoringCase(name, "src") ||
+ DeprecatedEqualIgnoringCase(name, "movie") ||
+ DeprecatedEqualIgnoringCase(name, "code") ||
+ DeprecatedEqualIgnoringCase(name, "url")))
url_parameter = StripLeadingAndTrailingHTMLSpaces(p->Value());
// TODO(schenney): crbug.com/572908 serviceType calculation does not belong
// in this function.
- if (service_type.IsEmpty() && EqualIgnoringCase(name, "type")) {
+ if (service_type.IsEmpty() && DeprecatedEqualIgnoringCase(name, "type")) {
service_type = p->Value();
size_t pos = service_type.Find(";");
if (pos != kNotFound)
@@ -428,7 +430,7 @@
for (HTMLElement& child : Traversal<HTMLElement>::ChildrenOf(*this)) {
if (isHTMLParamElement(child) &&
- EqualIgnoringCase(child.GetNameAttribute(), "type") &&
+ DeprecatedEqualIgnoringCase(child.GetNameAttribute(), "type") &&
MIMETypeRegistry::IsJavaAppletMIMEType(
child.getAttribute(valueAttr).GetString()))
return true;
diff --git a/third_party/WebKit/Source/core/html/HTMLParagraphElement.cpp b/third_party/WebKit/Source/core/html/HTMLParagraphElement.cpp
index bd0821f5..94b9b8b 100644
--- a/third_party/WebKit/Source/core/html/HTMLParagraphElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLParagraphElement.cpp
@@ -40,14 +40,14 @@
const AtomicString& value,
MutableStylePropertySet* style) {
if (name == alignAttr) {
- if (EqualIgnoringCase(value, "middle") ||
- EqualIgnoringCase(value, "center"))
+ if (DeprecatedEqualIgnoringCase(value, "middle") ||
+ DeprecatedEqualIgnoringCase(value, "center"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueWebkitCenter);
- else if (EqualIgnoringCase(value, "left"))
+ else if (DeprecatedEqualIgnoringCase(value, "left"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueWebkitLeft);
- else if (EqualIgnoringCase(value, "right"))
+ else if (DeprecatedEqualIgnoringCase(value, "right"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueWebkitRight);
else
diff --git a/third_party/WebKit/Source/core/html/HTMLParamElement.cpp b/third_party/WebKit/Source/core/html/HTMLParamElement.cpp
index a168088..e2c9771 100644
--- a/third_party/WebKit/Source/core/html/HTMLParamElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLParamElement.cpp
@@ -46,8 +46,9 @@
}
bool HTMLParamElement::IsURLParameter(const String& name) {
- return EqualIgnoringCase(name, "data") || EqualIgnoringCase(name, "movie") ||
- EqualIgnoringCase(name, "src");
+ return DeprecatedEqualIgnoringCase(name, "data") ||
+ DeprecatedEqualIgnoringCase(name, "movie") ||
+ DeprecatedEqualIgnoringCase(name, "src");
}
bool HTMLParamElement::IsURLAttribute(const Attribute& attribute) const {
diff --git a/third_party/WebKit/Source/core/html/HTMLTableElement.cpp b/third_party/WebKit/Source/core/html/HTMLTableElement.cpp
index 89a9080a..abae97a 100644
--- a/third_party/WebKit/Source/core/html/HTMLTableElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLTableElement.cpp
@@ -277,22 +277,22 @@
border_bottom = false;
border_left = false;
- if (EqualIgnoringCase(value, "above"))
+ if (DeprecatedEqualIgnoringCase(value, "above"))
border_top = true;
- else if (EqualIgnoringCase(value, "below"))
+ else if (DeprecatedEqualIgnoringCase(value, "below"))
border_bottom = true;
- else if (EqualIgnoringCase(value, "hsides"))
+ else if (DeprecatedEqualIgnoringCase(value, "hsides"))
border_top = border_bottom = true;
- else if (EqualIgnoringCase(value, "vsides"))
+ else if (DeprecatedEqualIgnoringCase(value, "vsides"))
border_left = border_right = true;
- else if (EqualIgnoringCase(value, "lhs"))
+ else if (DeprecatedEqualIgnoringCase(value, "lhs"))
border_left = true;
- else if (EqualIgnoringCase(value, "rhs"))
+ else if (DeprecatedEqualIgnoringCase(value, "rhs"))
border_right = true;
- else if (EqualIgnoringCase(value, "box") ||
- EqualIgnoringCase(value, "border"))
+ else if (DeprecatedEqualIgnoringCase(value, "box") ||
+ DeprecatedEqualIgnoringCase(value, "border"))
border_top = border_bottom = border_left = border_right = true;
- else if (!EqualIgnoringCase(value, "void"))
+ else if (!DeprecatedEqualIgnoringCase(value, "void"))
return false;
return true;
}
@@ -337,7 +337,7 @@
}
} else if (name == alignAttr) {
if (!value.IsEmpty()) {
- if (EqualIgnoringCase(value, "center")) {
+ if (DeprecatedEqualIgnoringCase(value, "center")) {
AddPropertyToPresentationAttributeStyle(
style, CSSPropertyWebkitMarginStart, CSSValueAuto);
AddPropertyToPresentationAttributeStyle(
@@ -411,15 +411,15 @@
params.new_value, border_top, border_right, border_bottom, border_left);
} else if (name == rulesAttr) {
rules_attr_ = kUnsetRules;
- if (EqualIgnoringCase(params.new_value, "none"))
+ if (DeprecatedEqualIgnoringCase(params.new_value, "none"))
rules_attr_ = kNoneRules;
- else if (EqualIgnoringCase(params.new_value, "groups"))
+ else if (DeprecatedEqualIgnoringCase(params.new_value, "groups"))
rules_attr_ = kGroupsRules;
- else if (EqualIgnoringCase(params.new_value, "rows"))
+ else if (DeprecatedEqualIgnoringCase(params.new_value, "rows"))
rules_attr_ = kRowsRules;
- else if (EqualIgnoringCase(params.new_value, "cols"))
+ else if (DeprecatedEqualIgnoringCase(params.new_value, "cols"))
rules_attr_ = kColsRules;
- else if (EqualIgnoringCase(params.new_value, "all"))
+ else if (DeprecatedEqualIgnoringCase(params.new_value, "all"))
rules_attr_ = kAllRules;
} else if (params.name == cellpaddingAttr) {
if (!params.new_value.IsEmpty())
diff --git a/third_party/WebKit/Source/core/html/HTMLTablePartElement.cpp b/third_party/WebKit/Source/core/html/HTMLTablePartElement.cpp
index 90880a6d..fbd48978 100644
--- a/third_party/WebKit/Source/core/html/HTMLTablePartElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLTablePartElement.cpp
@@ -67,33 +67,33 @@
style->SetProperty(CSSProperty(CSSPropertyBackgroundImage, *image_value));
}
} else if (name == valignAttr) {
- if (EqualIgnoringCase(value, "top"))
+ if (DeprecatedEqualIgnoringCase(value, "top"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAlign,
CSSValueTop);
- else if (EqualIgnoringCase(value, "middle"))
+ else if (DeprecatedEqualIgnoringCase(value, "middle"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAlign,
CSSValueMiddle);
- else if (EqualIgnoringCase(value, "bottom"))
+ else if (DeprecatedEqualIgnoringCase(value, "bottom"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAlign,
CSSValueBottom);
- else if (EqualIgnoringCase(value, "baseline"))
+ else if (DeprecatedEqualIgnoringCase(value, "baseline"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAlign,
CSSValueBaseline);
else
AddPropertyToPresentationAttributeStyle(style, CSSPropertyVerticalAlign,
value);
} else if (name == alignAttr) {
- if (EqualIgnoringCase(value, "middle") ||
- EqualIgnoringCase(value, "center"))
+ if (DeprecatedEqualIgnoringCase(value, "middle") ||
+ DeprecatedEqualIgnoringCase(value, "center"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueWebkitCenter);
- else if (EqualIgnoringCase(value, "absmiddle"))
+ else if (DeprecatedEqualIgnoringCase(value, "absmiddle"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueCenter);
- else if (EqualIgnoringCase(value, "left"))
+ else if (DeprecatedEqualIgnoringCase(value, "left"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueWebkitLeft);
- else if (EqualIgnoringCase(value, "right"))
+ else if (DeprecatedEqualIgnoringCase(value, "right"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyTextAlign,
CSSValueWebkitRight);
else
diff --git a/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp b/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp
index f17c368e..57410aa 100644
--- a/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLTextAreaElement.cpp
@@ -179,10 +179,11 @@
// deprecated. The soft/hard /off values are a recommendation for HTML 4
// extension by IE and NS 4.
WrapMethod wrap;
- if (EqualIgnoringCase(value, "physical") ||
- EqualIgnoringCase(value, "hard") || EqualIgnoringCase(value, "on"))
+ if (DeprecatedEqualIgnoringCase(value, "physical") ||
+ DeprecatedEqualIgnoringCase(value, "hard") ||
+ DeprecatedEqualIgnoringCase(value, "on"))
wrap = kHardWrap;
- else if (EqualIgnoringCase(value, "off"))
+ else if (DeprecatedEqualIgnoringCase(value, "off"))
wrap = kNoWrap;
else
wrap = kSoftWrap;
diff --git a/third_party/WebKit/Source/core/html/HTMLUListElement.cpp b/third_party/WebKit/Source/core/html/HTMLUListElement.cpp
index c815669..85f3d947 100644
--- a/third_party/WebKit/Source/core/html/HTMLUListElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLUListElement.cpp
@@ -46,16 +46,16 @@
const AtomicString& value,
MutableStylePropertySet* style) {
if (name == typeAttr) {
- if (EqualIgnoringCase(value, "disc"))
+ if (DeprecatedEqualIgnoringCase(value, "disc"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleType,
CSSValueDisc);
- else if (EqualIgnoringCase(value, "circle"))
+ else if (DeprecatedEqualIgnoringCase(value, "circle"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleType,
CSSValueCircle);
- else if (EqualIgnoringCase(value, "square"))
+ else if (DeprecatedEqualIgnoringCase(value, "square"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleType,
CSSValueSquare);
- else if (EqualIgnoringCase(value, "none"))
+ else if (DeprecatedEqualIgnoringCase(value, "none"))
AddPropertyToPresentationAttributeStyle(style, CSSPropertyListStyleType,
CSSValueNone);
} else {
diff --git a/third_party/WebKit/Source/core/html/LinkRelAttribute.cpp b/third_party/WebKit/Source/core/html/LinkRelAttribute.cpp
index 8e29187e..1c48426 100644
--- a/third_party/WebKit/Source/core/html/LinkRelAttribute.cpp
+++ b/third_party/WebKit/Source/core/html/LinkRelAttribute.cpp
@@ -53,40 +53,41 @@
Vector<String> list;
rel_copy.Split(' ', list);
for (const String& link_type : list) {
- if (EqualIgnoringCase(link_type, "stylesheet")) {
+ if (DeprecatedEqualIgnoringCase(link_type, "stylesheet")) {
if (!is_import_)
is_style_sheet_ = true;
- } else if (EqualIgnoringCase(link_type, "import")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "import")) {
if (!is_style_sheet_)
is_import_ = true;
- } else if (EqualIgnoringCase(link_type, "alternate")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "alternate")) {
is_alternate_ = true;
- } else if (EqualIgnoringCase(link_type, "icon")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "icon")) {
// This also allows "shortcut icon" since we just ignore the non-standard
// "shortcut" token.
// FIXME: This doesn't really follow the spec that requires "shortcut
// icon" to be the entire string
// http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#rel-icon
icon_type_ = kFavicon;
- } else if (EqualIgnoringCase(link_type, "prefetch")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "prefetch")) {
is_link_prefetch_ = true;
- } else if (EqualIgnoringCase(link_type, "dns-prefetch")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "dns-prefetch")) {
is_dns_prefetch_ = true;
- } else if (EqualIgnoringCase(link_type, "preconnect")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "preconnect")) {
is_preconnect_ = true;
- } else if (EqualIgnoringCase(link_type, "preload")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "preload")) {
is_link_preload_ = true;
- } else if (EqualIgnoringCase(link_type, "prerender")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "prerender")) {
is_link_prerender_ = true;
- } else if (EqualIgnoringCase(link_type, "next")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "next")) {
is_link_next_ = true;
- } else if (EqualIgnoringCase(link_type, "apple-touch-icon")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "apple-touch-icon")) {
icon_type_ = kTouchIcon;
- } else if (EqualIgnoringCase(link_type, "apple-touch-icon-precomposed")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type,
+ "apple-touch-icon-precomposed")) {
icon_type_ = kTouchPrecomposedIcon;
- } else if (EqualIgnoringCase(link_type, "manifest")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "manifest")) {
is_manifest_ = true;
- } else if (EqualIgnoringCase(link_type, "serviceworker")) {
+ } else if (DeprecatedEqualIgnoringCase(link_type, "serviceworker")) {
is_service_worker_ = true;
}
// Adding or removing a value here requires you to update
diff --git a/third_party/WebKit/Source/core/html/TextControlElement.cpp b/third_party/WebKit/Source/core/html/TextControlElement.cpp
index 955b426..ade35db 100644
--- a/third_party/WebKit/Source/core/html/TextControlElement.cpp
+++ b/third_party/WebKit/Source/core/html/TextControlElement.cpp
@@ -648,13 +648,14 @@
DEFINE_STATIC_LOCAL(const AtomicString, sentences, ("sentences"));
const AtomicString& value = FastGetAttribute(autocapitalizeAttr);
- if (EqualIgnoringCase(value, none) || EqualIgnoringCase(value, off))
+ if (DeprecatedEqualIgnoringCase(value, none) ||
+ DeprecatedEqualIgnoringCase(value, off))
return none;
- if (EqualIgnoringCase(value, characters))
+ if (DeprecatedEqualIgnoringCase(value, characters))
return characters;
- if (EqualIgnoringCase(value, words))
+ if (DeprecatedEqualIgnoringCase(value, words))
return words;
- if (EqualIgnoringCase(value, sentences))
+ if (DeprecatedEqualIgnoringCase(value, sentences))
return sentences;
// Invalid or missing value.
@@ -936,11 +937,11 @@
if (dir_attribute_value.IsNull())
continue;
- if (EqualIgnoringCase(dir_attribute_value, "rtl") ||
- EqualIgnoringCase(dir_attribute_value, "ltr"))
+ if (DeprecatedEqualIgnoringCase(dir_attribute_value, "rtl") ||
+ DeprecatedEqualIgnoringCase(dir_attribute_value, "ltr"))
return dir_attribute_value;
- if (EqualIgnoringCase(dir_attribute_value, "auto")) {
+ if (DeprecatedEqualIgnoringCase(dir_attribute_value, "auto")) {
bool is_auto;
TextDirection text_direction =
element->DirectionalityIfhasDirAutoAttribute(is_auto);
diff --git a/third_party/WebKit/Source/core/html/forms/ColorInputType.cpp b/third_party/WebKit/Source/core/html/forms/ColorInputType.cpp
index eda3781..d294cd8e 100644
--- a/third_party/WebKit/Source/core/html/forms/ColorInputType.cpp
+++ b/third_party/WebKit/Source/core/html/forms/ColorInputType.cpp
@@ -173,7 +173,7 @@
}
void ColorInputType::WarnIfValueIsInvalid(const String& value) const {
- if (!EqualIgnoringCase(value, GetElement().SanitizeValue(value)))
+ if (!DeprecatedEqualIgnoringCase(value, GetElement().SanitizeValue(value)))
AddWarningToConsole(
"The specified value %s does not conform to the required format. The "
"format is \"#rrggbb\" where rr, gg, bb are two-digit hexadecimal "
diff --git a/third_party/WebKit/Source/core/html/forms/HiddenInputType.cpp b/third_party/WebKit/Source/core/html/forms/HiddenInputType.cpp
index 7640fe2..6365ef8 100644
--- a/third_party/WebKit/Source/core/html/forms/HiddenInputType.cpp
+++ b/third_party/WebKit/Source/core/html/forms/HiddenInputType.cpp
@@ -99,7 +99,7 @@
}
void HiddenInputType::AppendToFormData(FormData& form_data) const {
- if (EqualIgnoringCase(GetElement().GetName(), "_charset_")) {
+ if (DeprecatedEqualIgnoringCase(GetElement().GetName(), "_charset_")) {
form_data.append(GetElement().GetName(),
String(form_data.Encoding().GetName()));
return;
diff --git a/third_party/WebKit/Source/core/html/forms/InputType.cpp b/third_party/WebKit/Source/core/html/forms/InputType.cpp
index 40d4fac..6832d73 100644
--- a/third_party/WebKit/Source/core/html/forms/InputType.cpp
+++ b/third_party/WebKit/Source/core/html/forms/InputType.cpp
@@ -717,7 +717,7 @@
EventQueueScope scope;
Decimal new_value = current;
const AtomicString& step_string = GetElement().FastGetAttribute(stepAttr);
- if (!EqualIgnoringCase(step_string, "any") &&
+ if (!DeprecatedEqualIgnoringCase(step_string, "any") &&
step_range.StepMismatch(current)) {
// Snap-to-step / clamping steps
// If the current value is not matched to step value:
@@ -738,7 +738,7 @@
}
new_value = new_value + step_range.Step() * Decimal::FromDouble(count);
- if (!EqualIgnoringCase(step_string, "any"))
+ if (!DeprecatedEqualIgnoringCase(step_string, "any"))
new_value = step_range.AlignValueForStep(current, new_value);
// 7. If the element has a minimum, and value is less than that minimum,
diff --git a/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp b/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp
index 6ac6bfeae..39671d84 100644
--- a/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp
+++ b/third_party/WebKit/Source/core/html/forms/NumberInputType.cpp
@@ -157,7 +157,7 @@
preferred_size = default_size;
const String step_string = GetElement().FastGetAttribute(stepAttr);
- if (EqualIgnoringCase(step_string, "any"))
+ if (DeprecatedEqualIgnoringCase(step_string, "any"))
return false;
const Decimal minimum =
diff --git a/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp b/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp
index 5a6458f..511eeb4 100644
--- a/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp
+++ b/third_party/WebKit/Source/core/html/forms/RangeInputType.cpp
@@ -184,10 +184,10 @@
// FIXME: We can't use stepUp() for the step value "any". So, we increase
// or decrease the value by 1/100 of the value range. Is it reasonable?
- const Decimal step =
- EqualIgnoringCase(GetElement().FastGetAttribute(stepAttr), "any")
- ? (step_range.Maximum() - step_range.Minimum()) / 100
- : step_range.Step();
+ const Decimal step = DeprecatedEqualIgnoringCase(
+ GetElement().FastGetAttribute(stepAttr), "any")
+ ? (step_range.Maximum() - step_range.Minimum()) / 100
+ : step_range.Step();
const Decimal big_step =
std::max((step_range.Maximum() - step_range.Minimum()) / 10, step);
diff --git a/third_party/WebKit/Source/core/html/forms/StepRange.cpp b/third_party/WebKit/Source/core/html/forms/StepRange.cpp
index 2d6674f..d0344df 100644
--- a/third_party/WebKit/Source/core/html/forms/StepRange.cpp
+++ b/third_party/WebKit/Source/core/html/forms/StepRange.cpp
@@ -109,7 +109,7 @@
if (step_string.IsEmpty())
return step_description.DefaultValue();
- if (EqualIgnoringCase(step_string, "any")) {
+ if (DeprecatedEqualIgnoringCase(step_string, "any")) {
switch (any_step_handling) {
case kRejectAny:
return Decimal::Nan();
diff --git a/third_party/WebKit/Source/core/html/forms/TextInputType.cpp b/third_party/WebKit/Source/core/html/forms/TextInputType.cpp
index 3f72974..141837c 100644
--- a/third_party/WebKit/Source/core/html/forms/TextInputType.cpp
+++ b/third_party/WebKit/Source/core/html/forms/TextInputType.cpp
@@ -46,9 +46,9 @@
if (GetElement().FastHasAttribute(maxlengthAttr))
CountUsageIfVisible(UseCounter::kInputTypeTextMaxLength);
const AtomicString& type = GetElement().FastGetAttribute(typeAttr);
- if (EqualIgnoringCase(type, InputTypeNames::datetime))
+ if (DeprecatedEqualIgnoringCase(type, InputTypeNames::datetime))
CountUsageIfVisible(UseCounter::kInputTypeDateTimeFallback);
- else if (EqualIgnoringCase(type, InputTypeNames::week))
+ else if (DeprecatedEqualIgnoringCase(type, InputTypeNames::week))
CountUsageIfVisible(UseCounter::kInputTypeWeekFallback);
}
diff --git a/third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp b/third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp
index edfffe96..5020505 100644
--- a/third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp
+++ b/third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp
@@ -234,7 +234,7 @@
}
void CSSPreloadScanner::EmitRule(const SegmentedString& source) {
- if (EqualIgnoringCase(rule_, "import")) {
+ if (DeprecatedEqualIgnoringCase(rule_, "import")) {
String url = ParseCSSStringOrURL(rule_value_.ToString());
TextPosition position =
TextPosition(source.CurrentLine(), source.CurrentColumn());
@@ -247,7 +247,7 @@
requests_->push_back(std::move(request));
}
state_ = kInitial;
- } else if (EqualIgnoringCase(rule_, "charset"))
+ } else if (DeprecatedEqualIgnoringCase(rule_, "charset"))
state_ = kInitial;
else
state_ = kDoneParsingImportRules;
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp
index 5866b14..728aae8 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLConstructionSite.cpp
@@ -572,14 +572,16 @@
kTextCaseASCIIInsensitive) ||
public_id.StartsWith("-//W3O//DTD W3 HTML 3.0//",
kTextCaseASCIIInsensitive) ||
- EqualIgnoringCase(public_id, "-//W3O//DTD W3 HTML Strict 3.0//EN//") ||
+ DeprecatedEqualIgnoringCase(public_id,
+ "-//W3O//DTD W3 HTML Strict 3.0//EN//") ||
public_id.StartsWith("-//WebTechs//DTD Mozilla HTML 2.0//",
kTextCaseASCIIInsensitive) ||
public_id.StartsWith("-//WebTechs//DTD Mozilla HTML//",
kTextCaseASCIIInsensitive) ||
- EqualIgnoringCase(public_id, "-/W3C/DTD HTML 4.0 Transitional/EN") ||
- EqualIgnoringCase(public_id, "HTML") ||
- EqualIgnoringCase(
+ DeprecatedEqualIgnoringCase(public_id,
+ "-/W3C/DTD HTML 4.0 Transitional/EN") ||
+ DeprecatedEqualIgnoringCase(public_id, "HTML") ||
+ DeprecatedEqualIgnoringCase(
system_id,
"http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd") ||
(system_id.IsEmpty() &&
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLElementStack.cpp b/third_party/WebKit/Source/core/html/parser/HTMLElementStack.cpp
index 2c1bf45..22a78725 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLElementStack.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLElementStack.cpp
@@ -245,8 +245,8 @@
item->GetAttributeItem(MathMLNames::encodingAttr);
if (encoding_attr) {
const String& encoding = encoding_attr->Value();
- return EqualIgnoringCase(encoding, "text/html") ||
- EqualIgnoringCase(encoding, "application/xhtml+xml");
+ return DeprecatedEqualIgnoringCase(encoding, "text/html") ||
+ DeprecatedEqualIgnoringCase(encoding, "application/xhtml+xml");
}
return false;
}
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLParserIdioms.cpp b/third_party/WebKit/Source/core/html/parser/HTMLParserIdioms.cpp
index eb9ed56..8c77004 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLParserIdioms.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLParserIdioms.cpp
@@ -418,7 +418,7 @@
const String& attribute_value = AtomicString(html_attribute.second);
if (ThreadSafeMatch(attribute_name, http_equivAttr)) {
- if (EqualIgnoringCase(attribute_value, "content-type"))
+ if (DeprecatedEqualIgnoringCase(attribute_value, "content-type"))
got_pragma = true;
} else if (charset.IsEmpty()) {
if (ThreadSafeMatch(attribute_name, charsetAttr)) {
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp
index 69667fd8..cee44198 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp
@@ -372,11 +372,12 @@
void ProcessInputAttribute(const NameType& attribute_name,
const String& attribute_value) {
// FIXME - Don't set type multiple times.
- if (Match(attribute_name, srcAttr))
+ if (Match(attribute_name, srcAttr)) {
SetUrlToLoad(attribute_value, kDisallowURLReplacement);
- else if (Match(attribute_name, typeAttr))
+ } else if (Match(attribute_name, typeAttr)) {
input_is_image_ =
- EqualIgnoringCase(attribute_value, InputTypeNames::image);
+ DeprecatedEqualIgnoringCase(attribute_value, InputTypeNames::image);
+ }
}
template <typename NameType>
@@ -681,13 +682,13 @@
return;
String content_attribute_value(content_attribute->Value());
- if (EqualIgnoringCase(name_attribute_value, "viewport")) {
+ if (DeprecatedEqualIgnoringCase(name_attribute_value, "viewport")) {
HandleMetaViewport(content_attribute_value, document_parameters,
media_values, viewport);
return;
}
- if (EqualIgnoringCase(name_attribute_value, "referrer")) {
+ if (DeprecatedEqualIgnoringCase(name_attribute_value, "referrer")) {
HandleMetaReferrer(content_attribute_value, document_parameters,
css_scanner);
}
@@ -819,10 +820,11 @@
token.GetAttributeItem(http_equivAttr);
if (equiv_attribute) {
String equiv_attribute_value(equiv_attribute->Value());
- if (EqualIgnoringCase(equiv_attribute_value,
- "content-security-policy")) {
+ if (DeprecatedEqualIgnoringCase(equiv_attribute_value,
+ "content-security-policy")) {
*is_csp_meta_tag = true;
- } else if (EqualIgnoringCase(equiv_attribute_value, "accept-ch")) {
+ } else if (DeprecatedEqualIgnoringCase(equiv_attribute_value,
+ "accept-ch")) {
const typename Token::Attribute* content_attribute =
token.GetAttributeItem(contentAttr);
if (content_attribute)
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp
index 432fa8d5..cbb0958 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp
@@ -723,7 +723,7 @@
Attribute* type_attribute = token->GetAttributeItem(typeAttr);
bool disable_frameset =
!type_attribute ||
- !EqualIgnoringCase(type_attribute->Value(), "hidden");
+ !DeprecatedEqualIgnoringCase(type_attribute->Value(), "hidden");
tree_.ReconstructTheActiveFormattingElements();
tree_.InsertSelfClosingHTMLElementDestroyingToken(token);
@@ -965,7 +965,7 @@
if (token->GetName() == inputTag) {
Attribute* type_attribute = token->GetAttributeItem(typeAttr);
if (type_attribute &&
- EqualIgnoringCase(type_attribute->Value(), "hidden")) {
+ DeprecatedEqualIgnoringCase(type_attribute->Value(), "hidden")) {
ParseError(token);
tree_.InsertSelfClosingHTMLElementDestroyingToken(token);
return;
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilderSimulator.cpp b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilderSimulator.cpp
index b20b813..2ad260b 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilderSimulator.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilderSimulator.cpp
@@ -85,8 +85,8 @@
static bool TokenExitsSVG(const CompactHTMLToken& token) {
// FIXME: It's very fragile that we special case foreignObject here to be
// case-insensitive.
- return EqualIgnoringCase(token.Data(),
- SVGNames::foreignObjectTag.LocalName());
+ return DeprecatedEqualIgnoringCase(token.Data(),
+ SVGNames::foreignObjectTag.LocalName());
}
static bool TokenExitsMath(const CompactHTMLToken& token) {
diff --git a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
index cb9093c..d2666ee2 100644
--- a/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
+++ b/third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp
@@ -119,9 +119,9 @@
TextResourceDecoder::ContentType TextResourceDecoder::DetermineContentType(
const String& mime_type) {
- if (EqualIgnoringCase(mime_type, "text/css"))
+ if (DeprecatedEqualIgnoringCase(mime_type, "text/css"))
return kCSSContent;
- if (EqualIgnoringCase(mime_type, "text/html"))
+ if (DeprecatedEqualIgnoringCase(mime_type, "text/html"))
return kHTMLContent;
if (DOMImplementation::IsXMLMIMEType(mime_type))
return kXMLContent;
diff --git a/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp b/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp
index c9c8bec..3a2e2fd 100644
--- a/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp
+++ b/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp
@@ -174,8 +174,8 @@
static bool IsDangerousHTTPEquiv(const String& value) {
String equiv = value.StripWhiteSpace();
- return EqualIgnoringCase(equiv, "refresh") ||
- EqualIgnoringCase(equiv, "set-cookie");
+ return DeprecatedEqualIgnoringCase(equiv, "refresh") ||
+ DeprecatedEqualIgnoringCase(equiv, "set-cookie");
}
static inline String Decode16BitUnicodeEscapeSequences(const String& string) {
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
index b4e3583..fb59d84 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
@@ -1011,7 +1011,7 @@
(node->nodeName().FindIgnoringCase(tag_name_query) !=
kNotFound)) ||
(start_tag_found && end_tag_found &&
- EqualIgnoringCase(node->nodeName(), tag_name_query)) ||
+ DeprecatedEqualIgnoringCase(node->nodeName(), tag_name_query)) ||
(start_tag_found && !end_tag_found &&
node->nodeName().StartsWith(tag_name_query,
kTextCaseUnicodeInsensitive)) ||
diff --git a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
index da77e15..6d7112c 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
@@ -150,7 +150,7 @@
decoder->UseLenientXMLDecoding();
return decoder;
}
- if (EqualIgnoringCase(mime_type, "text/html"))
+ if (DeprecatedEqualIgnoringCase(mime_type, "text/html"))
return TextResourceDecoder::Create("text/html", "UTF-8");
if (MIMETypeRegistry::IsSupportedJavaScriptMIMEType(mime_type) ||
DOMImplementation::IsJSONMIMEType(mime_type))
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
index 221b5d1..7056497 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -86,7 +86,7 @@
namespace blink {
static bool IsArchiveMIMEType(const String& mime_type) {
- return EqualIgnoringCase("multipart/related", mime_type);
+ return DeprecatedEqualIgnoringCase("multipart/related", mime_type);
}
static bool ShouldInheritSecurityOriginFromOwner(const KURL& url) {
diff --git a/third_party/WebKit/Source/core/loader/FormSubmission.cpp b/third_party/WebKit/Source/core/loader/FormSubmission.cpp
index 9689878..5247244 100644
--- a/third_party/WebKit/Source/core/loader/FormSubmission.cpp
+++ b/third_party/WebKit/Source/core/loader/FormSubmission.cpp
@@ -67,7 +67,7 @@
const String& encoding_type) {
String body = data.FlattenToString();
- if (EqualIgnoringCase(encoding_type, "text/plain")) {
+ if (DeprecatedEqualIgnoringCase(encoding_type, "text/plain")) {
// Convention seems to be to decode, and s/&/\r\n/. Also, spaces are encoded
// as %20.
body = DecodeURLEscapeSequences(
@@ -94,9 +94,9 @@
}
AtomicString FormSubmission::Attributes::ParseEncodingType(const String& type) {
- if (EqualIgnoringCase(type, "multipart/form-data"))
+ if (DeprecatedEqualIgnoringCase(type, "multipart/form-data"))
return AtomicString("multipart/form-data");
- if (EqualIgnoringCase(type, "text/plain"))
+ if (DeprecatedEqualIgnoringCase(type, "text/plain"))
return AtomicString("text/plain");
return AtomicString("application/x-www-form-urlencoded");
}
@@ -108,9 +108,9 @@
FormSubmission::SubmitMethod FormSubmission::Attributes::ParseMethodType(
const String& type) {
- if (EqualIgnoringCase(type, "post"))
+ if (DeprecatedEqualIgnoringCase(type, "post"))
return FormSubmission::kPostMethod;
- if (EqualIgnoringCase(type, "dialog"))
+ if (DeprecatedEqualIgnoringCase(type, "dialog"))
return FormSubmission::kDialogMethod;
return FormSubmission::kGetMethod;
}
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 981e6b7..832657b 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -705,7 +705,7 @@
// was created, then the navigation must be done with replacement enabled."
if (request.ReplacesCurrentItem() ||
(!state_machine_.CommittedMultipleRealLoads() &&
- EqualIgnoringCase(frame_->GetDocument()->Url(), BlankURL())))
+ DeprecatedEqualIgnoringCase(frame_->GetDocument()->Url(), BlankURL())))
return kFrameLoadTypeReplaceCurrentItem;
if (request.GetResourceRequest().Url() == document_loader_->UrlForHistory()) {
@@ -1264,7 +1264,7 @@
// We don't do this if we are submitting a form with method other than "GET",
// explicitly reloading, currently displaying a frameset, or if the URL does
// not have a fragment.
- return EqualIgnoringCase(http_method, HTTPNames::GET) &&
+ return DeprecatedEqualIgnoringCase(http_method, HTTPNames::GET) &&
!IsReloadLoadType(load_type) &&
load_type != kFrameLoadTypeBackForward &&
url.HasFragmentIdentifier() &&
diff --git a/third_party/WebKit/Source/core/loader/HistoryItem.cpp b/third_party/WebKit/Source/core/loader/HistoryItem.cpp
index 961755b..ad722d15 100644
--- a/third_party/WebKit/Source/core/loader/HistoryItem.cpp
+++ b/third_party/WebKit/Source/core/loader/HistoryItem.cpp
@@ -137,7 +137,7 @@
}
void HistoryItem::SetFormInfoFromRequest(const ResourceRequest& request) {
- if (EqualIgnoringCase(request.HttpMethod(), "POST")) {
+ if (DeprecatedEqualIgnoringCase(request.HttpMethod(), "POST")) {
// FIXME: Eventually we have to make this smart enough to handle the case
// where we have a stream for the body to handle the "data interspersed with
// files" feature.
diff --git a/third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.cpp b/third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.cpp
index 1d4cca58..fbf781a 100644
--- a/third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.cpp
@@ -201,8 +201,9 @@
return true;
AtomicString content_type = HttpContentType();
return content_type.IsEmpty() ||
- EqualIgnoringCase(content_type, "text/css") ||
- EqualIgnoringCase(content_type, "application/x-unknown-content-type");
+ DeprecatedEqualIgnoringCase(content_type, "text/css") ||
+ DeprecatedEqualIgnoringCase(content_type,
+ "application/x-unknown-content-type");
}
StyleSheetContents* CSSStyleSheetResource::RestoreParsedStyleSheet(
diff --git a/third_party/WebKit/Source/core/page/ContextMenuController.cpp b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
index ef4a278..dcc485df 100644
--- a/third_party/WebKit/Source/core/page/ContextMenuController.cpp
+++ b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
@@ -91,8 +91,8 @@
HTMLElement& element = ToHTMLElement(*node);
HTMLMenuElement* menu_element = element.AssignedContextMenu();
- if (!menu_element ||
- !EqualIgnoringCase(menu_element->FastGetAttribute(typeAttr), "context"))
+ if (!menu_element || !DeprecatedEqualIgnoringCase(
+ menu_element->FastGetAttribute(typeAttr), "context"))
return;
RelatedEvent* related_event =
RelatedEvent::Create(EventTypeNames::show, true, true, node);
diff --git a/third_party/WebKit/Source/core/page/CustomContextMenuProvider.cpp b/third_party/WebKit/Source/core/page/CustomContextMenuProvider.cpp
index 70dd710..2a80d465 100644
--- a/third_party/WebKit/Source/core/page/CustomContextMenuProvider.cpp
+++ b/third_party/WebKit/Source/core/page/CustomContextMenuProvider.cpp
@@ -86,8 +86,10 @@
}
ContextMenuAction action = static_cast<ContextMenuAction>(
kContextMenuItemBaseCustomTag + menu_items_.size() - 1);
- if (EqualIgnoringCase(menu_item->FastGetAttribute(typeAttr), "checkbox") ||
- EqualIgnoringCase(menu_item->FastGetAttribute(typeAttr), "radio"))
+ if (DeprecatedEqualIgnoringCase(menu_item->FastGetAttribute(typeAttr),
+ "checkbox") ||
+ DeprecatedEqualIgnoringCase(menu_item->FastGetAttribute(typeAttr),
+ "radio"))
context_menu.AppendItem(
ContextMenuItem(kCheckableActionType, action, label_string, icon,
enabled, menu_item->FastHasAttribute(checkedAttr)));
diff --git a/third_party/WebKit/Source/core/testing/InternalSettings.cpp b/third_party/WebKit/Source/core/testing/InternalSettings.cpp
index 0d21ae0..3968155 100644
--- a/third_party/WebKit/Source/core/testing/InternalSettings.cpp
+++ b/third_party/WebKit/Source/core/testing/InternalSettings.cpp
@@ -197,11 +197,11 @@
void InternalSettings::setViewportStyle(const String& style,
ExceptionState& exception_state) {
InternalSettingsGuardForSettings();
- if (EqualIgnoringCase(style, "default"))
+ if (DeprecatedEqualIgnoringCase(style, "default"))
GetSettings()->SetViewportStyle(WebViewportStyle::kDefault);
- else if (EqualIgnoringCase(style, "mobile"))
+ else if (DeprecatedEqualIgnoringCase(style, "mobile"))
GetSettings()->SetViewportStyle(WebViewportStyle::kMobile);
- else if (EqualIgnoringCase(style, "television"))
+ else if (DeprecatedEqualIgnoringCase(style, "television"))
GetSettings()->SetViewportStyle(WebViewportStyle::kTelevision);
else
exception_state.ThrowDOMException(
@@ -342,13 +342,13 @@
void InternalSettings::setEditingBehavior(const String& editing_behavior,
ExceptionState& exception_state) {
InternalSettingsGuardForSettings();
- if (EqualIgnoringCase(editing_behavior, "win"))
+ if (DeprecatedEqualIgnoringCase(editing_behavior, "win"))
GetSettings()->SetEditingBehaviorType(kEditingWindowsBehavior);
- else if (EqualIgnoringCase(editing_behavior, "mac"))
+ else if (DeprecatedEqualIgnoringCase(editing_behavior, "mac"))
GetSettings()->SetEditingBehaviorType(kEditingMacBehavior);
- else if (EqualIgnoringCase(editing_behavior, "unix"))
+ else if (DeprecatedEqualIgnoringCase(editing_behavior, "unix"))
GetSettings()->SetEditingBehaviorType(kEditingUnixBehavior);
- else if (EqualIgnoringCase(editing_behavior, "android"))
+ else if (DeprecatedEqualIgnoringCase(editing_behavior, "android"))
GetSettings()->SetEditingBehaviorType(kEditingAndroidBehavior);
else
exception_state.ThrowDOMException(kSyntaxError,
@@ -492,11 +492,11 @@
const String& policy,
ExceptionState& exception_state) {
InternalSettingsGuardForSettings();
- if (EqualIgnoringCase(policy, "allowed"))
+ if (DeprecatedEqualIgnoringCase(policy, "allowed"))
GetSettings()->SetImageAnimationPolicy(kImageAnimationPolicyAllowed);
- else if (EqualIgnoringCase(policy, "once"))
+ else if (DeprecatedEqualIgnoringCase(policy, "once"))
GetSettings()->SetImageAnimationPolicy(kImageAnimationPolicyAnimateOnce);
- else if (EqualIgnoringCase(policy, "none"))
+ else if (DeprecatedEqualIgnoringCase(policy, "none"))
GetSettings()->SetImageAnimationPolicy(kImageAnimationPolicyNoAnimation);
else
exception_state.ThrowDOMException(
diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
index 553081d..a7a8ac7 100644
--- a/third_party/WebKit/Source/core/testing/Internals.cpp
+++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -191,18 +191,18 @@
static WTF::Optional<DocumentMarker::MarkerType> MarkerTypeFrom(
const String& marker_type) {
- if (EqualIgnoringCase(marker_type, "Spelling"))
+ if (DeprecatedEqualIgnoringCase(marker_type, "Spelling"))
return DocumentMarker::kSpelling;
- if (EqualIgnoringCase(marker_type, "Grammar"))
+ if (DeprecatedEqualIgnoringCase(marker_type, "Grammar"))
return DocumentMarker::kGrammar;
- if (EqualIgnoringCase(marker_type, "TextMatch"))
+ if (DeprecatedEqualIgnoringCase(marker_type, "TextMatch"))
return DocumentMarker::kTextMatch;
return WTF::kNullopt;
}
static WTF::Optional<DocumentMarker::MarkerTypes> MarkerTypesFrom(
const String& marker_type) {
- if (marker_type.IsEmpty() || EqualIgnoringCase(marker_type, "all"))
+ if (marker_type.IsEmpty() || DeprecatedEqualIgnoringCase(marker_type, "all"))
return DocumentMarker::AllMarkers();
WTF::Optional<DocumentMarker::MarkerType> type = MarkerTypeFrom(marker_type);
if (!type)
diff --git a/third_party/WebKit/Source/core/xml/XPathFunctions.cpp b/third_party/WebKit/Source/core/xml/XPathFunctions.cpp
index c720247..93c7493 100644
--- a/third_party/WebKit/Source/core/xml/XPathFunctions.cpp
+++ b/third_party/WebKit/Source/core/xml/XPathFunctions.cpp
@@ -642,7 +642,7 @@
String lang_value = language_attribute->Value();
while (true) {
- if (EqualIgnoringCase(lang_value, lang))
+ if (DeprecatedEqualIgnoringCase(lang_value, lang))
return true;
// Remove suffixes one by one.
diff --git a/third_party/WebKit/Source/core/xml/XPathStep.cpp b/third_party/WebKit/Source/core/xml/XPathStep.cpp
index 7942936..68a1d1d 100644
--- a/third_party/WebKit/Source/core/xml/XPathStep.cpp
+++ b/third_party/WebKit/Source/core/xml/XPathStep.cpp
@@ -217,7 +217,7 @@
// Paths without namespaces should match HTML elements in HTML
// documents despite those having an XHTML namespace. Names are
// compared case-insensitively.
- return EqualIgnoringCase(element.localName(), name) &&
+ return DeprecatedEqualIgnoringCase(element.localName(), name) &&
(namespace_uri.IsNull() ||
namespace_uri == element.namespaceURI());
}
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
index 656a5d00..2159ec6 100644
--- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
+++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp
@@ -1482,7 +1482,7 @@
}
bool XMLHttpRequest::ResponseIsHTML() const {
- return EqualIgnoringCase(FinalResponseMIMEType(), "text/html");
+ return DeprecatedEqualIgnoringCase(FinalResponseMIMEType(), "text/html");
}
int XMLHttpRequest::status() const {
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasStyle.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasStyle.cpp
index 811721f..8b260e78 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasStyle.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasStyle.cpp
@@ -51,7 +51,7 @@
static ColorParseResult ParseColor(Color& parsed_color,
const String& color_string) {
- if (EqualIgnoringCase(color_string, "currentcolor"))
+ if (DeprecatedEqualIgnoringCase(color_string, "currentcolor"))
return kParsedCurrentColor;
const bool kUseStrictParsing = true;
if (CSSParser::ParseColor(parsed_color, color_string, kUseStrictParsing))
diff --git a/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp b/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp
index e69483c7..a5f1d15 100644
--- a/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp
+++ b/third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp
@@ -194,7 +194,7 @@
return false;
if (it->algorithm_name_length != algorithm_name.length() ||
- !EqualIgnoringCase(algorithm_name, it->algorithm_name))
+ !DeprecatedEqualIgnoringCase(algorithm_name, it->algorithm_name))
return false;
id = it->algorithm_id;
diff --git a/third_party/WebKit/Source/modules/eventsource/EventSource.cpp b/third_party/WebKit/Source/modules/eventsource/EventSource.cpp
index c7019c7..114fbd5 100644
--- a/third_party/WebKit/Source/modules/eventsource/EventSource.cpp
+++ b/third_party/WebKit/Source/modules/eventsource/EventSource.cpp
@@ -253,7 +253,7 @@
const String& charset = response.TextEncodingName();
// If we have a charset, the only allowed value is UTF-8 (case-insensitive).
response_is_valid =
- charset.IsEmpty() || EqualIgnoringCase(charset, "UTF-8");
+ charset.IsEmpty() || DeprecatedEqualIgnoringCase(charset, "UTF-8");
if (!response_is_valid) {
StringBuilder message;
message.Append("EventSource's response has a charset (\"");
diff --git a/third_party/WebKit/Source/modules/webdatabase/DatabaseAuthorizer.cpp b/third_party/WebKit/Source/modules/webdatabase/DatabaseAuthorizer.cpp
index 11304a2..b38b0b6 100644
--- a/third_party/WebKit/Source/modules/webdatabase/DatabaseAuthorizer.cpp
+++ b/third_party/WebKit/Source/modules/webdatabase/DatabaseAuthorizer.cpp
@@ -244,7 +244,7 @@
return kSQLAuthDeny;
// Allow only the FTS3 extension
- if (!EqualIgnoringCase(module_name, "fts3"))
+ if (!DeprecatedEqualIgnoringCase(module_name, "fts3"))
return kSQLAuthDeny;
last_action_changed_database_ = true;
@@ -257,7 +257,7 @@
return kSQLAuthDeny;
// Allow only the FTS3 extension
- if (!EqualIgnoringCase(module_name, "fts3"))
+ if (!DeprecatedEqualIgnoringCase(module_name, "fts3"))
return kSQLAuthDeny;
return UpdateDeletesBasedOnTableName(table_name);
@@ -355,7 +355,7 @@
// equalIgnoringCase(tableName, Database::databaseInfoTableName()))
// return SQLAuthDeny;
- if (EqualIgnoringCase(table_name, database_info_table_name_))
+ if (DeprecatedEqualIgnoringCase(table_name, database_info_table_name_))
return kSQLAuthDeny;
return kSQLAuthAllow;
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
index 3934d5f..b83b7e3 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
@@ -2817,7 +2817,7 @@
const char* const* prefix_set = Prefixes();
for (; *prefix_set; ++prefix_set) {
String prefixed_name = String(*prefix_set) + ExtensionName();
- if (EqualIgnoringCase(prefixed_name, name)) {
+ if (DeprecatedEqualIgnoringCase(prefixed_name, name)) {
return true;
}
}
diff --git a/third_party/WebKit/Source/platform/exported/WebServiceWorkerRequest.cpp b/third_party/WebKit/Source/platform/exported/WebServiceWorkerRequest.cpp
index aa9478f6..20404131 100644
--- a/third_party/WebKit/Source/platform/exported/WebServiceWorkerRequest.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebServiceWorkerRequest.cpp
@@ -69,14 +69,14 @@
void WebServiceWorkerRequest::SetHeader(const WebString& key,
const WebString& value) {
- if (EqualIgnoringCase(key, "referer"))
+ if (DeprecatedEqualIgnoringCase(key, "referer"))
return;
private_->headers_.Set(key, value);
}
void WebServiceWorkerRequest::AppendHeader(const WebString& key,
const WebString& value) {
- if (EqualIgnoringCase(key, "referer"))
+ if (DeprecatedEqualIgnoringCase(key, "referer"))
return;
HTTPHeaderMap::AddResult result = private_->headers_.Add(key, value);
if (!result.is_new_entry)
diff --git a/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp b/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp
index 158ac2c1..0fbd502 100644
--- a/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebURLRequest.cpp
@@ -162,7 +162,7 @@
void WebURLRequest::SetHTTPHeaderField(const WebString& name,
const WebString& value) {
- RELEASE_ASSERT(!EqualIgnoringCase(name, "referer"));
+ RELEASE_ASSERT(!DeprecatedEqualIgnoringCase(name, "referer"));
resource_request_->SetHTTPHeaderField(name, value);
}
diff --git a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
index 19e263f..5440bc8 100644
--- a/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
+++ b/third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp
@@ -93,7 +93,7 @@
String target_string;
for (size_t j = 0; j < targets->size(); ++j) {
if (targets->at(j)->AsString(&target_string)) {
- if (EqualIgnoringCase(target_string, "self")) {
+ if (DeprecatedEqualIgnoringCase(target_string, "self")) {
if (!origin->IsUnique())
origins.push_back(origin);
} else if (target_string == "*") {
diff --git a/third_party/WebKit/Source/platform/fonts/AlternateFontFamily.h b/third_party/WebKit/Source/platform/fonts/AlternateFontFamily.h
index 36cbe4e..c5b17a9 100644
--- a/third_party/WebKit/Source/platform/fonts/AlternateFontFamily.h
+++ b/third_party/WebKit/Source/platform/fonts/AlternateFontFamily.h
@@ -48,14 +48,14 @@
// using 'Courier New' on windows.
DEFINE_STATIC_LOCAL(AtomicString, courier, ("Courier"));
DEFINE_STATIC_LOCAL(AtomicString, courier_new, ("Courier New"));
- if (EqualIgnoringCase(family_name, courier))
+ if (DeprecatedEqualIgnoringCase(family_name, courier))
return courier_new;
// Alias 'MS Sans Serif' (bitmap font) -> 'Microsoft Sans Serif'
// (truetype font).
DEFINE_STATIC_LOCAL(AtomicString, ms_sans, ("MS Sans Serif"));
DEFINE_STATIC_LOCAL(AtomicString, microsoft_sans, ("Microsoft Sans Serif"));
- if (EqualIgnoringCase(family_name, ms_sans))
+ if (DeprecatedEqualIgnoringCase(family_name, ms_sans))
return microsoft_sans;
// Alias 'MS Serif' (bitmap) -> 'Times New Roman' (truetype font).
@@ -64,8 +64,8 @@
DEFINE_STATIC_LOCAL(AtomicString, ms_serif, ("MS Serif"));
DEFINE_STATIC_LOCAL(AtomicString, times, ("Times"));
DEFINE_STATIC_LOCAL(AtomicString, times_new_roman, ("Times New Roman"));
- if (EqualIgnoringCase(family_name, ms_serif) ||
- EqualIgnoringCase(family_name, times))
+ if (DeprecatedEqualIgnoringCase(family_name, ms_serif) ||
+ DeprecatedEqualIgnoringCase(family_name, times))
return times_new_roman;
#endif
@@ -77,30 +77,30 @@
// Alias Courier <-> Courier New
DEFINE_STATIC_LOCAL(AtomicString, courier, ("Courier"));
DEFINE_STATIC_LOCAL(AtomicString, courier_new, ("Courier New"));
- if (EqualIgnoringCase(family_name, courier))
+ if (DeprecatedEqualIgnoringCase(family_name, courier))
return courier_new;
#if !OS(WIN)
// On Windows, Courier New (truetype font) is always present and
// Courier is a bitmap font. So, we don't want to map Courier New to
// Courier.
- if (EqualIgnoringCase(family_name, courier_new))
+ if (DeprecatedEqualIgnoringCase(family_name, courier_new))
return courier;
#endif
// Alias Times and Times New Roman.
DEFINE_STATIC_LOCAL(AtomicString, times, ("Times"));
DEFINE_STATIC_LOCAL(AtomicString, times_new_roman, ("Times New Roman"));
- if (EqualIgnoringCase(family_name, times))
+ if (DeprecatedEqualIgnoringCase(family_name, times))
return times_new_roman;
- if (EqualIgnoringCase(family_name, times_new_roman))
+ if (DeprecatedEqualIgnoringCase(family_name, times_new_roman))
return times;
// Alias Arial and Helvetica
DEFINE_STATIC_LOCAL(AtomicString, arial, ("Arial"));
DEFINE_STATIC_LOCAL(AtomicString, helvetica, ("Helvetica"));
- if (EqualIgnoringCase(family_name, arial))
+ if (DeprecatedEqualIgnoringCase(family_name, arial))
return helvetica;
- if (EqualIgnoringCase(family_name, helvetica))
+ if (DeprecatedEqualIgnoringCase(family_name, helvetica))
return arial;
return g_empty_atom;
diff --git a/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp b/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp
index eb62630..b131898 100644
--- a/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp
@@ -121,8 +121,8 @@
}
bool FontCustomPlatformData::SupportsFormat(const String& format) {
- return EqualIgnoringCase(format, "truetype") ||
- EqualIgnoringCase(format, "opentype") ||
+ return DeprecatedEqualIgnoringCase(format, "truetype") ||
+ DeprecatedEqualIgnoringCase(format, "opentype") ||
WebFontDecoder::SupportsFormat(format);
}
diff --git a/third_party/WebKit/Source/platform/fonts/FontFaceCreationParams.h b/third_party/WebKit/Source/platform/fonts/FontFaceCreationParams.h
index 2f66538..d899883 100644
--- a/third_party/WebKit/Source/platform/fonts/FontFaceCreationParams.h
+++ b/third_party/WebKit/Source/platform/fonts/FontFaceCreationParams.h
@@ -119,7 +119,7 @@
bool operator==(const FontFaceCreationParams& other) const {
return creation_type_ == other.creation_type_ &&
- EqualIgnoringCase(family_, other.family_) &&
+ DeprecatedEqualIgnoringCase(family_, other.family_) &&
filename_ == other.filename_ &&
fontconfig_interface_id_ == other.fontconfig_interface_id_ &&
ttc_index_ == other.ttc_index_;
diff --git a/third_party/WebKit/Source/platform/fonts/WebFontDecoder.cpp b/third_party/WebKit/Source/platform/fonts/WebFontDecoder.cpp
index dd96948d..ebfbb928 100644
--- a/third_party/WebKit/Source/platform/fonts/WebFontDecoder.cpp
+++ b/third_party/WebKit/Source/platform/fonts/WebFontDecoder.cpp
@@ -176,8 +176,8 @@
// static
bool WebFontDecoder::SupportsFormat(const String& format) {
- return EqualIgnoringCase(format, "woff") ||
- EqualIgnoringCase(format, "woff2");
+ return DeprecatedEqualIgnoringCase(format, "woff") ||
+ DeprecatedEqualIgnoringCase(format, "woff2");
}
sk_sp<SkTypeface> WebFontDecoder::Decode(SharedBuffer* buffer) {
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
index 63514bf5..d230a9a 100644
--- a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
+++ b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
@@ -221,8 +221,9 @@
return nullptr;
}
-static inline bool EqualIgnoringCase(const AtomicString& a, const SkString& b) {
- return EqualIgnoringCase(a, ToAtomicString(b));
+static inline bool DeprecatedEqualIgnoringCase(const AtomicString& a,
+ const SkString& b) {
+ return DeprecatedEqualIgnoringCase(a, ToAtomicString(b));
}
static bool TypefacesMatchesFamily(const SkTypeface* tf,
@@ -233,7 +234,7 @@
SkTypeface::LocalizedString actual_family;
while (actual_families->next(&actual_family)) {
- if (EqualIgnoringCase(family, actual_family.fString)) {
+ if (DeprecatedEqualIgnoringCase(family, actual_family.fString)) {
matches_requested_family = true;
break;
}
@@ -248,7 +249,7 @@
if (!matches_requested_family) {
SkString family_name;
tf->getFamilyName(&family_name);
- if (EqualIgnoringCase(family, family_name))
+ if (DeprecatedEqualIgnoringCase(family, family_name))
matches_requested_family = true;
}
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp
index 18f7bae3c..26b7bca3 100644
--- a/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp
+++ b/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp
@@ -59,7 +59,7 @@
bool matches_requested_family = false;
SkTypeface::LocalizedString actual_family;
while (actual_families->next(&actual_family)) {
- if (EqualIgnoringCase(
+ if (DeprecatedEqualIgnoringCase(
family, AtomicString::FromUTF8(actual_family.fString.c_str()))) {
matches_requested_family = true;
break;
diff --git a/third_party/WebKit/Source/platform/loader/fetch/CrossOriginAccessControl.cpp b/third_party/WebKit/Source/platform/loader/fetch/CrossOriginAccessControl.cpp
index d15cf03..f5eb494d 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/CrossOriginAccessControl.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/CrossOriginAccessControl.cpp
@@ -62,7 +62,7 @@
// Exclude simple headers.
continue;
}
- if (EqualIgnoringCase(header.key, "referer")) {
+ if (DeprecatedEqualIgnoringCase(header.key, "referer")) {
// When the request is from a Worker, referrer header was added by
// WorkerThreadableLoader. But it should not be added to
// Access-Control-Request-Headers header.
@@ -353,7 +353,7 @@
response.HttpHeaderField(HTTPNames::Access_Control_Allow_External);
if (result.IsNull())
return kPreflightMissingAllowExternal;
- if (!EqualIgnoringCase(result, "true"))
+ if (!DeprecatedEqualIgnoringCase(result, "true"))
return kPreflightInvalidAllowExternal;
return kPreflightSuccess;
}
diff --git a/third_party/WebKit/Source/platform/loader/fetch/FetchUtils.cpp b/third_party/WebKit/Source/platform/loader/fetch/FetchUtils.cpp
index fb53d4c..a4d5e4c 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/FetchUtils.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/FetchUtils.cpp
@@ -95,16 +95,16 @@
// Treat inspector headers as a simple headers, since they are added by blink
// when the inspector is open.
- if (EqualIgnoringCase(name, "accept") ||
- EqualIgnoringCase(name, "accept-language") ||
- EqualIgnoringCase(name, "content-language") ||
- EqualIgnoringCase(
+ if (DeprecatedEqualIgnoringCase(name, "accept") ||
+ DeprecatedEqualIgnoringCase(name, "accept-language") ||
+ DeprecatedEqualIgnoringCase(name, "content-language") ||
+ DeprecatedEqualIgnoringCase(
name, HTTPNames::X_DevTools_Emulate_Network_Conditions_Client_Id) ||
- EqualIgnoringCase(name, HTTPNames::X_DevTools_Request_Id) ||
- EqualIgnoringCase(name, "save-data"))
+ DeprecatedEqualIgnoringCase(name, HTTPNames::X_DevTools_Request_Id) ||
+ DeprecatedEqualIgnoringCase(name, "save-data"))
return true;
- if (EqualIgnoringCase(name, "content-type"))
+ if (DeprecatedEqualIgnoringCase(name, "content-type"))
return IsSimpleContentType(value);
return false;
@@ -112,9 +112,10 @@
bool FetchUtils::IsSimpleContentType(const AtomicString& media_type) {
AtomicString mime_type = ExtractMIMETypeFromMediaType(media_type);
- return EqualIgnoringCase(mime_type, "application/x-www-form-urlencoded") ||
- EqualIgnoringCase(mime_type, "multipart/form-data") ||
- EqualIgnoringCase(mime_type, "text/plain");
+ return DeprecatedEqualIgnoringCase(mime_type,
+ "application/x-www-form-urlencoded") ||
+ DeprecatedEqualIgnoringCase(mime_type, "multipart/form-data") ||
+ DeprecatedEqualIgnoringCase(mime_type, "text/plain");
}
bool FetchUtils::IsSimpleRequest(const String& method,
@@ -136,9 +137,9 @@
// http://fetch.spec.whatwg.org/#forbidden-method
// "A forbidden method is a method that is a byte case-insensitive match"
// for one of `CONNECT`, `TRACE`, and `TRACK`."
- return EqualIgnoringCase(method, "TRACE") ||
- EqualIgnoringCase(method, "TRACK") ||
- EqualIgnoringCase(method, "CONNECT");
+ return DeprecatedEqualIgnoringCase(method, "TRACE") ||
+ DeprecatedEqualIgnoringCase(method, "TRACK") ||
+ DeprecatedEqualIgnoringCase(method, "CONNECT");
}
bool FetchUtils::IsForbiddenHeaderName(const String& name) {
@@ -160,8 +161,8 @@
// "A forbidden response header name is a header name that is one of:
// `Set-Cookie`, `Set-Cookie2`"
- return EqualIgnoringCase(name, "set-cookie") ||
- EqualIgnoringCase(name, "set-cookie2");
+ return DeprecatedEqualIgnoringCase(name, "set-cookie") ||
+ DeprecatedEqualIgnoringCase(name, "set-cookie2");
}
bool FetchUtils::IsSimpleOrForbiddenRequest(const String& method,
@@ -188,7 +189,7 @@
};
for (const auto& known : kMethods) {
- if (EqualIgnoringCase(method, known)) {
+ if (DeprecatedEqualIgnoringCase(method, known)) {
// Don't bother allocating a new string if it's already all
// uppercase.
return method == known ? method : known;
diff --git a/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp b/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp
index 65a55ae..0f40021 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp
@@ -88,7 +88,8 @@
const AtomicString& header) {
for (size_t i = 0; i < WTF_ARRAY_LENGTH(kHeadersToIgnoreAfterRevalidation);
i++) {
- if (EqualIgnoringCase(header, kHeadersToIgnoreAfterRevalidation[i]))
+ if (DeprecatedEqualIgnoringCase(header,
+ kHeadersToIgnoreAfterRevalidation[i]))
return false;
}
for (size_t i = 0;
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceResponse.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceResponse.cpp
index cd7d761a..4018d23 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceResponse.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceResponse.cpp
@@ -348,16 +348,16 @@
static const char kExpiresHeader[] = "expires";
static const char kLastModifiedHeader[] = "last-modified";
- if (EqualIgnoringCase(name, kAgeHeader))
+ if (DeprecatedEqualIgnoringCase(name, kAgeHeader))
have_parsed_age_header_ = false;
- else if (EqualIgnoringCase(name, kCacheControlHeader) ||
- EqualIgnoringCase(name, kPragmaHeader))
+ else if (DeprecatedEqualIgnoringCase(name, kCacheControlHeader) ||
+ DeprecatedEqualIgnoringCase(name, kPragmaHeader))
cache_control_header_ = CacheControlHeader();
- else if (EqualIgnoringCase(name, kDateHeader))
+ else if (DeprecatedEqualIgnoringCase(name, kDateHeader))
have_parsed_date_header_ = false;
- else if (EqualIgnoringCase(name, kExpiresHeader))
+ else if (DeprecatedEqualIgnoringCase(name, kExpiresHeader))
have_parsed_expires_header_ = false;
- else if (EqualIgnoringCase(name, kLastModifiedHeader))
+ else if (DeprecatedEqualIgnoringCase(name, kLastModifiedHeader))
have_parsed_last_modified_header_ = false;
}
@@ -517,7 +517,7 @@
if (loc != kNotFound)
value = value.Left(loc);
value = value.StripWhiteSpace();
- return EqualIgnoringCase(value, kAttachmentString);
+ return DeprecatedEqualIgnoringCase(value, kAttachmentString);
}
AtomicString ResourceResponse::HttpContentType() const {
diff --git a/third_party/WebKit/Source/platform/network/EncodedFormData.h b/third_party/WebKit/Source/platform/network/EncodedFormData.h
index be4d9322a5..120d189 100644
--- a/third_party/WebKit/Source/platform/network/EncodedFormData.h
+++ b/third_party/WebKit/Source/platform/network/EncodedFormData.h
@@ -152,9 +152,9 @@
}
static EncodingType ParseEncodingType(const String& type) {
- if (EqualIgnoringCase(type, "text/plain"))
+ if (DeprecatedEqualIgnoringCase(type, "text/plain"))
return kTextPlain;
- if (EqualIgnoringCase(type, "multipart/form-data"))
+ if (DeprecatedEqualIgnoringCase(type, "multipart/form-data"))
return kMultipartFormData;
return kFormURLEncoded;
}
diff --git a/third_party/WebKit/Source/platform/network/HTTPParsers.cpp b/third_party/WebKit/Source/platform/network/HTTPParsers.cpp
index 64c819ea..76b8839a 100644
--- a/third_party/WebKit/Source/platform/network/HTTPParsers.cpp
+++ b/third_party/WebKit/Source/platform/network/HTTPParsers.cpp
@@ -281,7 +281,7 @@
String disposition_type = parameters[0];
disposition_type.StripWhiteSpace();
- if (EqualIgnoringCase(disposition_type, "inline"))
+ if (DeprecatedEqualIgnoringCase(disposition_type, "inline"))
return kContentDispositionInline;
// Some broken sites just send bogus headers like
@@ -717,15 +717,17 @@
for (size_t i = 0; i < directives_size; ++i) {
// RFC2616 14.9.1: A no-cache directive with a value is only meaningful
// for proxy caches. It should be ignored by a browser level cache.
- if (EqualIgnoringCase(directives[i].first, kNoCacheDirective) &&
+ if (DeprecatedEqualIgnoringCase(directives[i].first, kNoCacheDirective) &&
directives[i].second.IsEmpty()) {
cache_control_header.contains_no_cache = true;
- } else if (EqualIgnoringCase(directives[i].first, kNoStoreDirective)) {
+ } else if (DeprecatedEqualIgnoringCase(directives[i].first,
+ kNoStoreDirective)) {
cache_control_header.contains_no_store = true;
- } else if (EqualIgnoringCase(directives[i].first,
- kMustRevalidateDirective)) {
+ } else if (DeprecatedEqualIgnoringCase(directives[i].first,
+ kMustRevalidateDirective)) {
cache_control_header.contains_must_revalidate = true;
- } else if (EqualIgnoringCase(directives[i].first, kMaxAgeDirective)) {
+ } else if (DeprecatedEqualIgnoringCase(directives[i].first,
+ kMaxAgeDirective)) {
if (!std::isnan(cache_control_header.max_age)) {
// First max-age directive wins if there are multiple ones.
continue;
diff --git a/third_party/WebKit/Source/platform/network/mime/MIMETypeRegistry.cpp b/third_party/WebKit/Source/platform/network/mime/MIMETypeRegistry.cpp
index f26a25e..bdb38ae 100644
--- a/third_party/WebKit/Source/platform/network/mime/MIMETypeRegistry.cpp
+++ b/third_party/WebKit/Source/platform/network/mime/MIMETypeRegistry.cpp
@@ -113,10 +113,10 @@
bool MIMETypeRegistry::IsSupportedImageMIMETypeForEncoding(
const String& mime_type) {
- if (EqualIgnoringCase(mime_type, "image/jpeg") ||
- EqualIgnoringCase(mime_type, "image/png"))
+ if (DeprecatedEqualIgnoringCase(mime_type, "image/jpeg") ||
+ DeprecatedEqualIgnoringCase(mime_type, "image/png"))
return true;
- if (EqualIgnoringCase(mime_type, "image/webp"))
+ if (DeprecatedEqualIgnoringCase(mime_type, "image/webp"))
return true;
return false;
}
@@ -197,7 +197,7 @@
}
bool MIMETypeRegistry::IsSupportedStyleSheetMIMEType(const String& mime_type) {
- return EqualIgnoringCase(mime_type, "text/css");
+ return DeprecatedEqualIgnoringCase(mime_type, "text/css");
}
bool MIMETypeRegistry::IsSupportedFontMIMEType(const String& mime_type) {
@@ -210,7 +210,7 @@
}
bool MIMETypeRegistry::IsSupportedTextTrackMIMEType(const String& mime_type) {
- return EqualIgnoringCase(mime_type, "text/vtt");
+ return DeprecatedEqualIgnoringCase(mime_type, "text/vtt");
}
} // namespace blink
diff --git a/third_party/WebKit/Source/platform/text/LocaleMac.mm b/third_party/WebKit/Source/platform/text/LocaleMac.mm
index eb144daa..c393454 100644
--- a/third_party/WebKit/Source/platform/text/LocaleMac.mm
+++ b/third_party/WebKit/Source/platform/text/LocaleMac.mm
@@ -57,7 +57,7 @@
String current_locale_language =
LanguageFromLocale(String([current_locale.Get() localeIdentifier]));
String locale_language = LanguageFromLocale(locale);
- if (EqualIgnoringCase(current_locale_language, locale_language))
+ if (DeprecatedEqualIgnoringCase(current_locale_language, locale_language))
return current_locale;
}
// It seems initWithLocaleIdentifier accepts dash-separated locale identifier.
diff --git a/third_party/WebKit/Source/platform/text/LocaleWin.cpp b/third_party/WebKit/Source/platform/text/LocaleWin.cpp
index 6926e94..27fc7bd 100644
--- a/third_party/WebKit/Source/platform/text/LocaleWin.cpp
+++ b/third_party/WebKit/Source/platform/text/LocaleWin.cpp
@@ -57,7 +57,8 @@
const String& user_default_language_code,
const String& locale) {
String locale_language_code = ExtractLanguageCode(locale);
- if (EqualIgnoringCase(locale_language_code, user_default_language_code))
+ if (DeprecatedEqualIgnoringCase(locale_language_code,
+ user_default_language_code))
return user_default_lcid;
if (locale.length() >= LOCALE_NAME_MAX_LENGTH)
return 0;
diff --git a/third_party/WebKit/Source/platform/wtf/text/StringBuilder.h b/third_party/WebKit/Source/platform/wtf/text/StringBuilder.h
index c9ae4b3..20e1745 100644
--- a/third_party/WebKit/Source/platform/wtf/text/StringBuilder.h
+++ b/third_party/WebKit/Source/platform/wtf/text/StringBuilder.h
@@ -235,24 +235,27 @@
}
template <typename CharType>
-bool EqualIgnoringCase(const StringBuilder& s,
- const CharType* buffer,
- unsigned length) {
+bool DeprecatedEqualIgnoringCase(const StringBuilder& s,
+ const CharType* buffer,
+ unsigned length) {
if (s.length() != length)
return false;
if (s.Is8Bit())
- return EqualIgnoringCase(s.Characters8(), buffer, length);
+ return DeprecatedEqualIgnoringCase(s.Characters8(), buffer, length);
- return EqualIgnoringCase(s.Characters16(), buffer, length);
+ return DeprecatedEqualIgnoringCase(s.Characters16(), buffer, length);
}
// Unicode aware case insensitive string matching. Non-ASCII characters might
// match to ASCII characters. This function is rarely used to implement web
// platform features.
-inline bool EqualIgnoringCase(const StringBuilder& s, const char* string) {
- return EqualIgnoringCase(s, reinterpret_cast<const LChar*>(string),
- strlen(string));
+// This function is deprecated. We should introduce EqualIgnoringASCIICase() or
+// EqualIgnoringUnicodeCase(). See crbug.com/627682
+inline bool DeprecatedEqualIgnoringCase(const StringBuilder& s,
+ const char* string) {
+ return DeprecatedEqualIgnoringCase(s, reinterpret_cast<const LChar*>(string),
+ strlen(string));
}
template <typename StringType>
diff --git a/third_party/WebKit/Source/platform/wtf/text/StringHash.h b/third_party/WebKit/Source/platform/wtf/text/StringHash.h
index 734518c..486e546 100644
--- a/third_party/WebKit/Source/platform/wtf/text/StringHash.h
+++ b/third_party/WebKit/Source/platform/wtf/text/StringHash.h
@@ -100,7 +100,7 @@
// Save one branch inside each StringView by derefing the StringImpl,
// and another branch inside the compare function by skipping the null
// checks.
- return EqualIgnoringCaseAndNullity(*a, *b);
+ return DeprecatedEqualIgnoringCaseAndNullity(*a, *b);
}
static unsigned GetHash(const RefPtr<StringImpl>& key) {
diff --git a/third_party/WebKit/Source/platform/wtf/text/StringImpl.cpp b/third_party/WebKit/Source/platform/wtf/text/StringImpl.cpp
index bca6443e..2a839a0 100644
--- a/third_party/WebKit/Source/platform/wtf/text/StringImpl.cpp
+++ b/third_party/WebKit/Source/platform/wtf/text/StringImpl.cpp
@@ -1286,7 +1286,9 @@
0x00fc, 0x00fd, 0x00fe, 0x00ff,
};
-bool EqualIgnoringCase(const LChar* a, const LChar* b, unsigned length) {
+bool DeprecatedEqualIgnoringCase(const LChar* a,
+ const LChar* b,
+ unsigned length) {
DCHECK_GE(length, 0u);
if (a == b)
return true;
@@ -1298,14 +1300,18 @@
return true;
}
-bool EqualIgnoringCase(const UChar* a, const UChar* b, unsigned length) {
+bool DeprecatedEqualIgnoringCase(const UChar* a,
+ const UChar* b,
+ unsigned length) {
DCHECK_GE(length, 0u);
if (a == b)
return true;
return !Unicode::Umemcasecmp(a, b, length);
}
-bool EqualIgnoringCase(const UChar* a, const LChar* b, unsigned length) {
+bool DeprecatedEqualIgnoringCase(const UChar* a,
+ const LChar* b,
+ unsigned length) {
while (length--) {
if (FoldCase(*a++) != StringImpl::kLatin1CaseFoldTable[*b++])
return false;
@@ -1405,8 +1411,8 @@
unsigned i = 0;
// keep looping until we match
- while (!EqualIgnoringCase(search_characters + i, match_characters,
- match_length)) {
+ while (!DeprecatedEqualIgnoringCase(search_characters + i, match_characters,
+ match_length)) {
if (i == delta)
return kNotFound;
++i;
@@ -1599,17 +1605,19 @@
if (prefix.length() > length())
return false;
if (Is8Bit()) {
- if (prefix.Is8Bit())
- return EqualIgnoringCase(Characters8(), prefix.Characters8(),
- prefix.length());
- return EqualIgnoringCase(Characters8(), prefix.Characters16(),
- prefix.length());
+ if (prefix.Is8Bit()) {
+ return DeprecatedEqualIgnoringCase(Characters8(), prefix.Characters8(),
+ prefix.length());
+ }
+ return DeprecatedEqualIgnoringCase(Characters8(), prefix.Characters16(),
+ prefix.length());
}
- if (prefix.Is8Bit())
- return EqualIgnoringCase(Characters16(), prefix.Characters8(),
- prefix.length());
- return EqualIgnoringCase(Characters16(), prefix.Characters16(),
- prefix.length());
+ if (prefix.Is8Bit()) {
+ return DeprecatedEqualIgnoringCase(Characters16(), prefix.Characters8(),
+ prefix.length());
+ }
+ return DeprecatedEqualIgnoringCase(Characters16(), prefix.Characters16(),
+ prefix.length());
}
bool StringImpl::StartsWithIgnoringASCIICase(const StringView& prefix) const {
@@ -1656,17 +1664,19 @@
return false;
unsigned start_offset = length() - suffix.length();
if (Is8Bit()) {
- if (suffix.Is8Bit())
- return EqualIgnoringCase(Characters8() + start_offset,
- suffix.Characters8(), suffix.length());
- return EqualIgnoringCase(Characters8() + start_offset,
- suffix.Characters16(), suffix.length());
+ if (suffix.Is8Bit()) {
+ return DeprecatedEqualIgnoringCase(Characters8() + start_offset,
+ suffix.Characters8(), suffix.length());
+ }
+ return DeprecatedEqualIgnoringCase(Characters8() + start_offset,
+ suffix.Characters16(), suffix.length());
}
- if (suffix.Is8Bit())
- return EqualIgnoringCase(Characters16() + start_offset,
- suffix.Characters8(), suffix.length());
- return EqualIgnoringCase(Characters16() + start_offset, suffix.Characters16(),
- suffix.length());
+ if (suffix.Is8Bit()) {
+ return DeprecatedEqualIgnoringCase(Characters16() + start_offset,
+ suffix.Characters8(), suffix.length());
+ }
+ return DeprecatedEqualIgnoringCase(Characters16() + start_offset,
+ suffix.Characters16(), suffix.length());
}
bool StringImpl::EndsWithIgnoringASCIICase(const StringView& suffix) const {
diff --git a/third_party/WebKit/Source/platform/wtf/text/StringImpl.h b/third_party/WebKit/Source/platform/wtf/text/StringImpl.h
index be9864e..2c65130 100644
--- a/third_party/WebKit/Source/platform/wtf/text/StringImpl.h
+++ b/third_party/WebKit/Source/platform/wtf/text/StringImpl.h
@@ -599,12 +599,22 @@
// Unicode aware case insensitive string matching. Non-ASCII characters might
// match to ASCII characters. These functions are rarely used to implement web
// platform features.
-WTF_EXPORT bool EqualIgnoringCase(const LChar*, const LChar*, unsigned length);
-WTF_EXPORT bool EqualIgnoringCase(const UChar*, const LChar*, unsigned length);
-inline bool EqualIgnoringCase(const LChar* a, const UChar* b, unsigned length) {
- return EqualIgnoringCase(b, a, length);
+// These functions are deprecated. Use EqualIgnoringASCIICase(), or introduce
+// EqualIgnoringUnicodeCase(). See crbug.com/627682
+WTF_EXPORT bool DeprecatedEqualIgnoringCase(const LChar*,
+ const LChar*,
+ unsigned length);
+WTF_EXPORT bool DeprecatedEqualIgnoringCase(const UChar*,
+ const LChar*,
+ unsigned length);
+inline bool DeprecatedEqualIgnoringCase(const LChar* a,
+ const UChar* b,
+ unsigned length) {
+ return DeprecatedEqualIgnoringCase(b, a, length);
}
-WTF_EXPORT bool EqualIgnoringCase(const UChar*, const UChar*, unsigned length);
+WTF_EXPORT bool DeprecatedEqualIgnoringCase(const UChar*,
+ const UChar*,
+ unsigned length);
WTF_EXPORT bool EqualIgnoringNullity(StringImpl*, StringImpl*);
diff --git a/third_party/WebKit/Source/platform/wtf/text/StringView.cpp b/third_party/WebKit/Source/platform/wtf/text/StringView.cpp
index 778303a..349f396 100644
--- a/third_party/WebKit/Source/platform/wtf/text/StringView.cpp
+++ b/third_party/WebKit/Source/platform/wtf/text/StringView.cpp
@@ -61,23 +61,30 @@
return Equal(a.Characters16(), b.Characters16(), a.length());
}
-bool EqualIgnoringCaseAndNullity(const StringView& a, const StringView& b) {
+bool DeprecatedEqualIgnoringCaseAndNullity(const StringView& a,
+ const StringView& b) {
if (a.length() != b.length())
return false;
if (a.Is8Bit()) {
- if (b.Is8Bit())
- return EqualIgnoringCase(a.Characters8(), b.Characters8(), a.length());
- return EqualIgnoringCase(a.Characters8(), b.Characters16(), a.length());
+ if (b.Is8Bit()) {
+ return DeprecatedEqualIgnoringCase(a.Characters8(), b.Characters8(),
+ a.length());
+ }
+ return DeprecatedEqualIgnoringCase(a.Characters8(), b.Characters16(),
+ a.length());
}
- if (b.Is8Bit())
- return EqualIgnoringCase(a.Characters16(), b.Characters8(), a.length());
- return EqualIgnoringCase(a.Characters16(), b.Characters16(), a.length());
+ if (b.Is8Bit()) {
+ return DeprecatedEqualIgnoringCase(a.Characters16(), b.Characters8(),
+ a.length());
+ }
+ return DeprecatedEqualIgnoringCase(a.Characters16(), b.Characters16(),
+ a.length());
}
-bool EqualIgnoringCase(const StringView& a, const StringView& b) {
+bool DeprecatedEqualIgnoringCase(const StringView& a, const StringView& b) {
if (a.IsNull() || b.IsNull())
return a.IsNull() == b.IsNull();
- return EqualIgnoringCaseAndNullity(a, b);
+ return DeprecatedEqualIgnoringCaseAndNullity(a, b);
}
bool EqualIgnoringASCIICase(const StringView& a, const StringView& b) {
diff --git a/third_party/WebKit/Source/platform/wtf/text/StringView.h b/third_party/WebKit/Source/platform/wtf/text/StringView.h
index 3c4d2fbc..9c4876a 100644
--- a/third_party/WebKit/Source/platform/wtf/text/StringView.h
+++ b/third_party/WebKit/Source/platform/wtf/text/StringView.h
@@ -221,9 +221,12 @@
// Unicode aware case insensitive string matching. Non-ASCII characters might
// match to ASCII characters. These functions are rarely used to implement web
// platform features.
-WTF_EXPORT bool EqualIgnoringCase(const StringView&, const StringView&);
-WTF_EXPORT bool EqualIgnoringCaseAndNullity(const StringView&,
+// These functions are deprecated. Use EqualIgnoringASCIICase(), or introduce
+// EqualIgnoringUnicodeCase(). See crbug.com/627682
+WTF_EXPORT bool DeprecatedEqualIgnoringCase(const StringView&,
const StringView&);
+WTF_EXPORT bool DeprecatedEqualIgnoringCaseAndNullity(const StringView&,
+ const StringView&);
WTF_EXPORT bool EqualIgnoringASCIICase(const StringView&, const StringView&);
@@ -266,7 +269,7 @@
using WTF::StringView;
using WTF::EqualIgnoringASCIICase;
-using WTF::EqualIgnoringCase;
+using WTF::DeprecatedEqualIgnoringCase;
using WTF::IsAllSpecialCharacters;
#endif
diff --git a/third_party/WebKit/Source/platform/wtf/text/WTFString.h b/third_party/WebKit/Source/platform/wtf/text/WTFString.h
index 73f0cd0..61dc5fd 100644
--- a/third_party/WebKit/Source/platform/wtf/text/WTFString.h
+++ b/third_party/WebKit/Source/platform/wtf/text/WTFString.h
@@ -475,7 +475,7 @@
inline bool EqualPossiblyIgnoringCase(const String& a,
const String& b,
bool ignore_case) {
- return ignore_case ? EqualIgnoringCase(a, b) : (a == b);
+ return ignore_case ? DeprecatedEqualIgnoringCase(a, b) : (a == b);
}
inline bool EqualIgnoringNullity(const String& a, const String& b) {
