[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 13:24:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f78c5dd227ff368b04c737883dc634673c98a5aa
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 14 14:42:41 2010 +0000
2010-09-14 Hyung Song <beergun at company100.net>
Reviewed by Darin Adler.
[BREWMP] Set m_size in SharedBuffer::createWithContentsOfFile();
https://bugs.webkit.org/show_bug.cgi?id=45701
SharedBuffer::createWithContentsOfFile() reads file content and saves to
result.m_buffer directly, leaving result.m_size unchanged.
* platform/brew/SharedBufferBrew.cpp:
(WebCore::SharedBuffer::createWithContentsOfFile):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67468 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1db8d8b..9d7b641 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-14 Hyung Song <beergun at company100.net>
+
+ Reviewed by Darin Adler.
+
+ [BREWMP] Set m_size in SharedBuffer::createWithContentsOfFile();
+ https://bugs.webkit.org/show_bug.cgi?id=45701
+
+ SharedBuffer::createWithContentsOfFile() reads file content and saves to
+ result.m_buffer directly, leaving result.m_size unchanged.
+
+ * platform/brew/SharedBufferBrew.cpp:
+ (WebCore::SharedBuffer::createWithContentsOfFile):
+
2010-09-14 Adam Barth <abarth at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/brew/SharedBufferBrew.cpp b/WebCore/platform/brew/SharedBufferBrew.cpp
index 597825c..3d4c20a 100644
--- a/WebCore/platform/brew/SharedBufferBrew.cpp
+++ b/WebCore/platform/brew/SharedBufferBrew.cpp
@@ -64,6 +64,7 @@ PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& fi
int32 bytesRead;
while ((bytesRead = IFILE_Read(file.get(), result->m_buffer.data() + totalBytesRead, fileSize - totalBytesRead)) > 0)
totalBytesRead += bytesRead;
+ result->m_size = totalBytesRead;
if (totalBytesRead != fileSize) {
LOG_ERROR("Failed to fully read contents of file %s - errno(%i)", filePath.ascii().data(), IFILEMGR_GetLastError(fileMgr.get()));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list