summaryrefslogtreecommitdiffstats
path: root/webkit/blob/local_file_stream_reader.h
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 09:09:04 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-18 09:09:04 +0000
commitbcded8d54cc4b84af71fcf56fbfccfe3820bff6c (patch)
tree50559292f11063dbed82154897c2328ce4cb9455 /webkit/blob/local_file_stream_reader.h
parent5538085e6d622f4c7b684597f697fd69be513489 (diff)
downloadchromium_src-bcded8d54cc4b84af71fcf56fbfccfe3820bff6c.zip
chromium_src-bcded8d54cc4b84af71fcf56fbfccfe3820bff6c.tar.gz
chromium_src-bcded8d54cc4b84af71fcf56fbfccfe3820bff6c.tar.bz2
webkit: Merge blob and fileapi into one build target 'webkit_storage'
Replace build targets 'blob' and 'fileapi' with newly introduced 'webkit_storage' Introduce a new directory webkit/storage to host webkit_storage.gypi and webkit_storage_export.h Replace BLOB_EXPORT and FILEAPI_EXPORT with WEBKIT_STORAGE_EXPORT BUG=155242 TEST=build TBR=darin@chromium.org, piman@chromium.org Review URL: https://chromiumcodereview.appspot.com/11103031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/blob/local_file_stream_reader.h')
-rw-r--r--webkit/blob/local_file_stream_reader.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/blob/local_file_stream_reader.h b/webkit/blob/local_file_stream_reader.h
index 97e08fb..55b70bf 100644
--- a/webkit/blob/local_file_stream_reader.h
+++ b/webkit/blob/local_file_stream_reader.h
@@ -8,11 +8,11 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/file_path.h"
-#include "base/platform_file.h"
#include "base/memory/weak_ptr.h"
+#include "base/platform_file.h"
#include "base/time.h"
-#include "webkit/blob/blob_export.h"
#include "webkit/blob/file_stream_reader.h"
+#include "webkit/storage/webkit_storage_export.h"
namespace base {
class TaskRunner;
@@ -26,7 +26,7 @@ namespace webkit_blob {
// A thin wrapper of net::FileStream with range support for sliced file
// handling.
-class BLOB_EXPORT LocalFileStreamReader : public FileStreamReader {
+class WEBKIT_STORAGE_EXPORT LocalFileStreamReader : public FileStreamReader {
public:
// Creates a new FileReader for a local file |file_path|.
// |initial_offset| specifies the offset in the file where the first read