[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 13:18:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f5c3ebb0399d833904437d9e48353153958b8177
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 10 21:29:44 2010 +0000
2010-09-10 Adam Barth <abarth at webkit.org>
Chromium build fix (one hopes!)
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::commitDocumentData):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67234 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b4d79fd..b9b1ae0 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,12 @@
2010-09-10 Adam Barth <abarth at webkit.org>
+ Chromium build fix (one hopes!)
+
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::commitDocumentData):
+
+2010-09-10 Adam Barth <abarth at webkit.org>
+
Reviewed by Eric Seidel.
Main resource bytes shouldn't bounce through FrameLoader
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 6620516..e622d99 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1026,7 +1026,7 @@ void WebFrameImpl::commitDocumentData(const char* data, size_t length)
encoding = documentLoader->response().textEncodingName();
}
m_frame->loader()->writer()->setEncoding(encoding, userChosen);
- m_frame->documentLoader()->addData(data, length);
+ m_frame->loader()->documentLoader()->addData(data, length);
}
unsigned WebFrameImpl::unloadListenerCount() const
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list