Chromium Code Reviews| Index: webkit/glue/dom_operations.cc |
| diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc |
| index cedf58ec04a7e6eea913b057e6bc1f9beb62cac1..59a4c06909c7609c89c1ca54635c1c8a1c05feb4 100644 |
| --- a/webkit/glue/dom_operations.cc |
| +++ b/webkit/glue/dom_operations.cc |
| @@ -9,6 +9,7 @@ |
| #include "base/compiler_specific.h" |
| #include "base/logging.h" |
| #include "base/string_util.h" |
| +#include "base/utf_string_conversions.h" |
|
MAD
2012/09/27 20:19:44
Did you try to also remove it from chrome/renderer
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebAnimationController.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" |
| @@ -309,8 +310,8 @@ int NumberOfActiveAnimations(WebView* view) { |
| } |
| void GetMetaElementsWithAttribute(WebDocument* document, |
| - const string16& attribute_name, |
| - const string16& attribute_value, |
| + const char* attribute_name, |
| + const char* attribute_value, |
| std::vector<WebElement>* meta_elements) { |
| DCHECK(document); |
| DCHECK(meta_elements); |
| @@ -319,6 +320,8 @@ void GetMetaElementsWithAttribute(WebDocument* document, |
| if (head.isNull() || !head.hasChildNodes()) |
| return; |
| + string16 attribute_name16(ASCIIToUTF16(attribute_name)); |
| + |
| WebNodeList children = head.childNodes(); |
| for (size_t i = 0; i < children.length(); ++i) { |
| WebNode node = children.item(i); |
| @@ -327,8 +330,8 @@ void GetMetaElementsWithAttribute(WebDocument* document, |
| WebElement element = node.to<WebElement>(); |
| if (!element.hasTagName("meta")) |
| continue; |
| - WebString value = element.getAttribute(attribute_name); |
| - if (value.isNull() || value != attribute_value) |
| + WebString value = element.getAttribute(attribute_name16); |
| + if (value.isNull() || !LowerCaseEqualsASCII(value, attribute_value)) |
| continue; |
| meta_elements->push_back(element); |
| } |