Title: [94816] trunk/Source/WebKit/chromium
- Revision
- 94816
- Author
- aba...@webkit.org
- Date
- 2011-09-08 16:03:46 -0700 (Thu, 08 Sep 2011)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (94815 => 94816)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-09-08 22:56:16 UTC (rev 94815)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-09-08 23:03:46 UTC (rev 94816)
@@ -1,3 +1,18 @@
+2011-09-08 Adam Barth <aba...@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 <wjmacl...@chromium.org>
[chromium] Add backend compositor support for rescaling (zooming) textures during zoom animation.
Modified: trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp (94815 => 94816)
--- trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2011-09-08 22:56:16 UTC (rev 94815)
+++ trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2011-09-08 23:03:46 UTC (rev 94816)
@@ -244,7 +244,7 @@
// 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());
Modified: trunk/Source/WebKit/chromium/src/WebDocument.cpp (94815 => 94816)
--- trunk/Source/WebKit/chromium/src/WebDocument.cpp 2011-09-08 22:56:16 UTC (rev 94815)
+++ trunk/Source/WebKit/chromium/src/WebDocument.cpp 2011-09-08 23:03:46 UTC (rev 94816)
@@ -74,7 +74,7 @@
WebString WebDocument::encoding() const
{
- return constUnwrap<Document>()->loader()->writer()->encoding();
+ return constUnwrap<Document>()->encoding();
}
WebURL WebDocument::openSearchDescriptionURL() const
Modified: trunk/Source/WebKit/chromium/src/WebPageSerializerImpl.cpp (94815 => 94816)
--- trunk/Source/WebKit/chromium/src/WebPageSerializerImpl.cpp 2011-09-08 22:56:16 UTC (rev 94815)
+++ trunk/Source/WebKit/chromium/src/WebPageSerializerImpl.cpp 2011-09-08 23:03:46 UTC (rev 94816)
@@ -169,7 +169,7 @@
// 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=\"");
Modified: trunk/Source/WebKit/chromium/src/WebSearchableFormData.cpp (94815 => 94816)
--- trunk/Source/WebKit/chromium/src/WebSearchableFormData.cpp 2011-09-08 22:56:16 UTC (rev 94815)
+++ trunk/Source/WebKit/chromium/src/WebSearchableFormData.cpp 2011-09-08 23:03:46 UTC (rev 94816)
@@ -66,7 +66,7 @@
}
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.
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (94815 => 94816)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-09-08 22:56:16 UTC (rev 94815)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-09-08 23:03:46 UTC (rev 94816)
@@ -1680,10 +1680,11 @@
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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
