[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9bb605b010120eef4ac35ec2bbb02140d66afeac
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 02:06:39 2010 +0000

    2010-08-29  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Kent Tamura.
    
            [BREWMP] Port SharedBuffer::createWithContentsOfFile
            https://bugs.webkit.org/show_bug.cgi?id=34412
    
            Implement SharedBuffer::createWithContentsOfFile with IFile.
    
            * platform/brew/SharedBufferBrew.cpp: Added.
            (WebCore::SharedBuffer::createWithContentsOfFile):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66348 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9c96066..7b74442 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-29  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Kent Tamura.
+
+        [BREWMP] Port SharedBuffer::createWithContentsOfFile
+        https://bugs.webkit.org/show_bug.cgi?id=34412
+
+        Implement SharedBuffer::createWithContentsOfFile with IFile.
+
+        * platform/brew/SharedBufferBrew.cpp: Added.
+        (WebCore::SharedBuffer::createWithContentsOfFile):
+
 2010-08-29  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/platform/brew/SharedBufferBrew.cpp b/WebCore/platform/brew/SharedBufferBrew.cpp
new file mode 100644
index 0000000..597825c
--- /dev/null
+++ b/WebCore/platform/brew/SharedBufferBrew.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2010 Company 100, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#include "config.h"
+#include "SharedBuffer.h"
+
+#include "FileSystem.h"
+#include "ShellBrew.h"
+
+#include <AEEAppGen.h>
+#include <AEEFile.h>
+#include <AEEStdLib.h>
+
+#include <wtf/OwnPtr.h>
+#include <wtf/text/CString.h>
+
+namespace WebCore {
+
+PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& filePath)
+{
+    if (filePath.isEmpty())
+        return 0;
+
+    long long fileSize;
+    if (!fileExists(filePath) || !getFileSize(filePath, fileSize))
+        return 0;
+
+    RefPtr<SharedBuffer> result = create();
+    result->m_buffer.grow(fileSize);
+
+    OwnPtr<IFileMgr> fileMgr = createInstance<IFileMgr>(AEECLSID_FILEMGR);
+
+    CString filename = fileSystemRepresentation(filePath);
+    OwnPtr<IFile> file(IFILEMGR_OpenFile(fileMgr.get(), filename.data(), _OFM_READ));
+
+    if (!file) {
+        LOG_ERROR("Failed to open file %s to create shared buffer, errno(%i)", filePath.ascii().data(), IFILEMGR_GetLastError(fileMgr.get()));
+        return 0;
+    }
+
+    size_t totalBytesRead = 0;
+    int32 bytesRead;
+    while ((bytesRead = IFILE_Read(file.get(), result->m_buffer.data() + totalBytesRead, fileSize - totalBytesRead)) > 0)
+        totalBytesRead += bytesRead;
+
+    if (totalBytesRead != fileSize) {
+        LOG_ERROR("Failed to fully read contents of file %s - errno(%i)", filePath.ascii().data(), IFILEMGR_GetLastError(fileMgr.get()));
+        return 0;
+    }
+
+    return result.release();
+}
+
+} // namespace WebCore

-- 
WebKit Debian packaging