Commit 969a1ef4 authored by abarth@webkit.org's avatar abarth@webkit.org
Browse files

Attempt to fix Chromium build. We can just grab the encoding from the document.

* src/ContextMenuClientImpl.cpp:
(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
* src/WebDocument.cpp:
(WebKit::WebDocument::encoding):
* src/WebPageSerializerImpl.cpp:
(WebKit::WebPageSerializerImpl::preActionBeforeSerializeOpenTag):
* src/WebSearchableFormData.cpp:
(HTMLNames::GetFormEncoding):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::pageEncoding):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@94816 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f19acb08
2011-09-08 Adam Barth <abarth@webkit.org>
Attempt to fix Chromium build. We can just grab the encoding from the document.
* src/ContextMenuClientImpl.cpp:
(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
* src/WebDocument.cpp:
(WebKit::WebDocument::encoding):
* src/WebPageSerializerImpl.cpp:
(WebKit::WebPageSerializerImpl::preActionBeforeSerializeOpenTag):
* src/WebSearchableFormData.cpp:
(HTMLNames::GetFormEncoding):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::pageEncoding):
2011-09-08 W. James MacLean <wjmaclean@chromium.org>
[chromium] Add backend compositor support for rescaling (zooming) textures during zoom animation.
......
......@@ -244,7 +244,7 @@ PlatformMenuDescription ContextMenuClientImpl::getCustomMenuFromDefaultItems(
// If it's not a link, an image, a media element, or an image/media link,
// show a selection menu or a more generic page menu.
if (selectedFrame->document()->loader())
data.frameEncoding = selectedFrame->document()->loader()->writer()->encoding();
data.frameEncoding = selectedFrame->document()->encoding();
// Send the frame and page URLs in any case.
data.pageURL = urlFromFrame(m_webView->mainFrameImpl()->frame());
......
......@@ -74,7 +74,7 @@ WebSecurityOrigin WebDocument::securityOrigin() const
WebString WebDocument::encoding() const
{
return constUnwrap<Document>()->loader()->writer()->encoding();
return constUnwrap<Document>()->encoding();
}
WebURL WebDocument::openSearchDescriptionURL() const
......
......@@ -169,7 +169,7 @@ String WebPageSerializerImpl::preActionBeforeSerializeOpenTag(
// Get encoding info.
String xmlEncoding = param->document->xmlEncoding();
if (xmlEncoding.isEmpty())
xmlEncoding = param->document->loader()->writer()->encoding();
xmlEncoding = param->document->encoding();
if (xmlEncoding.isEmpty())
xmlEncoding = UTF8Encoding().name();
result.append("<?xml version=\"");
......
......@@ -66,7 +66,7 @@ void GetFormEncoding(const HTMLFormElement* form, TextEncoding* encoding)
}
if (!form->document()->loader())
return;
*encoding = TextEncoding(form->document()->loader()->writer()->encoding());
*encoding = TextEncoding(form->document()->encoding());
}
// Returns true if the submit request results in an HTTP URL.
......
......@@ -1680,10 +1680,11 @@ WebString WebViewImpl::pageEncoding() const
if (!m_page.get())
return WebString();
// FIXME: Is this check needed?
if (!m_page->mainFrame()->document()->loader())
return WebString();
return m_page->mainFrame()->document()->loader()->writer()->encoding();
return m_page->mainFrame()->document()->encoding();
}
void WebViewImpl::setPageEncoding(const WebString& encodingName)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment