| Index: Source/core/page/PageSerializer.cpp
|
| diff --git a/Source/core/page/PageSerializer.cpp b/Source/core/page/PageSerializer.cpp
|
| index d41f871976383f86d0b3e5e170d4357621bda884..8e3e4ee6aabc03406b8a021f57ec9d5f2c9bf499 100644
|
| --- a/Source/core/page/PageSerializer.cpp
|
| +++ b/Source/core/page/PageSerializer.cpp
|
| @@ -48,13 +48,13 @@
|
| #include "core/editing/MarkupAccumulator.h"
|
| #include "core/fetch/FontResource.h"
|
| #include "core/fetch/ImageResource.h"
|
| +#include "core/frame/Frame.h"
|
| #include "core/html/HTMLFrameOwnerElement.h"
|
| #include "core/html/HTMLImageElement.h"
|
| #include "core/html/HTMLInputElement.h"
|
| #include "core/html/HTMLLinkElement.h"
|
| #include "core/html/HTMLStyleElement.h"
|
| -#include "core/html/parser/HTMLMetaCharsetParser.h"
|
| -#include "core/frame/Frame.h"
|
| +#include "core/html/parser/HTMLParserIdioms.h"
|
| #include "core/page/Page.h"
|
| #include "core/rendering/RenderImage.h"
|
| #include "core/rendering/style/StyleFetchedImage.h"
|
| @@ -76,15 +76,15 @@ static bool isCharsetSpecifyingNode(Node* node)
|
| HTMLElement* element = toHTMLElement(node);
|
| if (!element->hasTagName(HTMLNames::metaTag))
|
| return false;
|
| - HTMLMetaCharsetParser::AttributeList attributes;
|
| + HTMLAttributeList attributes;
|
| if (element->hasAttributes()) {
|
| for (unsigned i = 0; i < element->attributeCount(); ++i) {
|
| const Attribute* attribute = element->attributeItem(i);
|
| // FIXME: We should deal appropriately with the attribute if they have a namespace.
|
| - attributes.append(std::make_pair(attribute->name().toString(), attribute->value().string()));
|
| + attributes.append(std::make_pair(attribute->name().localName(), attribute->value().string()));
|
| }
|
| }
|
| - WTF::TextEncoding textEncoding = HTMLMetaCharsetParser::encodingFromMetaAttributes(attributes);
|
| + WTF::TextEncoding textEncoding = encodingFromMetaAttributes(attributes);
|
| return textEncoding.isValid();
|
| }
|
|
|
|
|