Add RawData request in preparation for manual loading of

Bitmaps and being able to flip them, scale them, etc...

Basically this just makes it possible to download a RawData
directly which you can then pass you'll be able to pass to
pack->CreateBitmapFromRawData.

Some design comments:

I used SetFromFile instead of making a different constructor
since it seemed wrong to do file IO in a constructor. Given
that SetFromFile is private I don't think this is a problem
since you can't call it directly.

Also, I thought about loading the file first and then calling
 the original constructor but it seemed like a waste to load 
the file into memory, then copy it to a new buffer when I could 
just load it directly. 

Finally I made it take a String instead of a FilePath because
it meant other places had to do less work.

Review URL: http://codereview.chromium.org/149784

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21015 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 75 insertions, 6 deletions

diff --git a/o3d/import/cross/raw_data.cc b/o3d/import/cross/raw_data.cc
index 53039c2..deabe37 100644
--- a/o3d/import/cross/raw_data.cc
+++ b/o3d/import/cross/raw_data.cc
@@ -35,6 +35,9 @@
 
 #include "import/cross/raw_data.h"
 #include "base/file_util.h"
+#include "utils/cross/file_path_utils.h"
+#include "base/file_path.h"
+#include "base/file_util.h"
 
 #ifdef OS_MACOSX
 #include <CoreFoundation/CoreFoundation.h>
@@ -44,6 +47,10 @@
 #include <rpc.h>
 #endif
 
+using file_util::OpenFile;
+using file_util::CloseFile;
+using file_util::GetFileSize;
+
 namespace o3d {
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -59,7 +66,7 @@ RawData::RawData(ServiceLocator* service_locator,
                  const String &uri,
                  const void *data,
                  size_t length)
-    : ParamObject(service_locator), uri_(uri) {
+    : ParamObject(service_locator), uri_(uri), allow_string_value_(true) {
   // make private copy of data
   data_.reset(new uint8[length]);
   length_ = length;
@@ -74,6 +81,17 @@ RawData::Ref RawData::Create(ServiceLocator* service_locator,
   return RawData::Ref(new RawData(service_locator, uri, data, length));
 }
 
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+RawData::Ref RawData::CreateFromFile(ServiceLocator* service_locator,
+                                     const String &uri,
+                                     const String& filename) {
+  RawData::Ref data(Create(service_locator, uri, NULL, 0));
+  if (!data->SetFromFile(filename)) {
+    data.Reset();
+  }
+
+  return data;
+}
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 RawData::~RawData() {
@@ -81,6 +99,46 @@ RawData::~RawData() {
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bool RawData::SetFromFile(const String& filename) {
+  // We can't allow general string files to be downloaded from anywhere
+  // as that would override the security measures that have been added to
+  // XMLHttpRequest over the years. Images and other binary datas are okay.
+  // because RawData can only be passed to stuff that understands specific
+  // formats.
+  allow_string_value_ = false;
+  FilePath filepath = UTF8ToFilePath(filename);
+  FILE *file = OpenFile(filepath, "rb");
+  bool result = false;
+  if (!file) {
+    DLOG(ERROR) << "file not found \"" << filename << "\"";
+  } else {
+    // Determine the file's length
+    int64 file_size64;
+    if (!GetFileSize(filepath, &file_size64)) {
+      DLOG(ERROR) << "error getting file size \"" << filename << "\"";
+    } else {
+      if (file_size64 > 0xffffffffLL) {
+        DLOG(ERROR) << "file is too large \"" << filename << "\"";
+      } else {
+        size_t file_length = static_cast<size_t>(file_size64);
+
+        // Load the file data into memory
+        data_.reset(new uint8[file_length]);
+        length_ = file_length;
+        if (fread(data_.get(), file_length, 1, file) != 1) {
+          DLOG(ERROR) << "error reading file \"" << filename << "\"";
+        } else {
+          result = true;
+        }
+      }
+    }
+    CloseFile(file);
+  }
+
+  return result;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 const uint8 *RawData::GetData() const {
   // Return data immediately if we have it
   if (data_.get()) {
@@ -195,12 +253,23 @@ String RawData::StringValue() const {
   // .json, .xml, .ini, .csv, .php, .js, .html, .css .xsl, .dae, etc.) So,
   // instead we validate the string is valid UTF-8 AND that there are no NULLs
   // in the string.
-  size_t length;
-  const char* utf8 = GetValidUTF8(*this, &length);
-  if (!utf8) {
-    O3D_ERROR(service_locator()) << "RawData is not valid UTF-8 string";
+
+  // We can't allow general string files to be downloaded from anywhere
+  // as that would override the security measures that have been added to
+  // XMLHttpRequest over the years. Images and other binary datas are okay.
+  // because RawData can only be passed to stuff that understands specific
+  // formats.
+  if (!allow_string_value_) {
+    O3D_ERROR(service_locator())
+        << "You can only get a stringValue from RawDatas inside archives.";
   } else {
-    return String (utf8, length);
+    size_t length;
+    const char* utf8 = GetValidUTF8(*this, &length);
+    if (!utf8) {
+      O3D_ERROR(service_locator()) << "RawData is not valid UTF-8 string";
+    } else {
+      return String (utf8, length);
+    }
   }
   return String();
 }