Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Unified Diff: Source/WebCore/bindings/v8/SerializedScriptValue.cpp

Issue 13497009: Remove ENABLE(FILE_SYSTEM) compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: added CodeGeneratorInspector.py change Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/bindings/v8/SerializedScriptValue.cpp
diff --git a/Source/WebCore/bindings/v8/SerializedScriptValue.cpp b/Source/WebCore/bindings/v8/SerializedScriptValue.cpp
index deec6e02ebca7d5aa6b46475e8feb2f62eec0f4b..165946793087ca98ac1d6e4a42aee5c858dbe160 100644
--- a/Source/WebCore/bindings/v8/SerializedScriptValue.cpp
+++ b/Source/WebCore/bindings/v8/SerializedScriptValue.cpp
@@ -45,6 +45,7 @@
#include "V8ArrayBufferView.h"
#include "V8Binding.h"
#include "V8Blob.h"
+#include "V8DOMFileSystem.h"
#include "V8DataView.h"
#include "V8File.h"
#include "V8FileList.h"
@@ -77,10 +78,6 @@
#include <wtf/Uint8ClampedArray.h>
#include <wtf/Vector.h>
-#if ENABLE(FILE_SYSTEM)
-#include "V8DOMFileSystem.h"
-#endif
-
// FIXME: consider crashing in debug mode on deserialization errors
// NOTE: be sure to change wireFormatVersion as necessary!
@@ -195,9 +192,7 @@ enum SerializationTag {
NumberTag = 'N', // value:double -> Number
BlobTag = 'b', // url:WebCoreString, type:WebCoreString, size:uint64_t -> Blob (ref)
FileTag = 'f', // file:RawFile -> File (ref)
-#if ENABLE(FILE_SYSTEM)
DOMFileSystemTag = 'd', // type:int32_t, name:WebCoreString, url:WebCoreString -> FileSystem (ref)
-#endif
FileListTag = 'l', // length:uint32_t, files:RawFile[length] -> FileList (ref)
ImageDataTag = '#', // width:uint32_t, height:uint32_t, pixelDataLength:uint32_t, data:byte[pixelDataLength] -> ImageData (ref)
ObjectTag = '{', // numProperties:uint32_t -> pops the last object from the open stack;
@@ -412,7 +407,6 @@ public:
doWriteUint64(size);
}
-#if ENABLE(FILE_SYSTEM)
void writeDOMFileSystem(int type, const String& name, const String& url)
{
append(DOMFileSystemTag);
@@ -420,7 +414,6 @@ public:
doWriteWebCoreString(name);
doWriteWebCoreString(url);
}
-#endif
void writeFile(const String& path, const String& url, const String& type)
{
@@ -1089,7 +1082,6 @@ private:
m_blobURLs.append(blob->url().string());
}
-#if ENABLE(FILE_SYSTEM)
StateBase* writeDOMFileSystem(v8::Handle<v8::Value> value, StateBase* next)
{
DOMFileSystem* fs = V8DOMFileSystem::toNative(value.As<v8::Object>());
@@ -1100,7 +1092,6 @@ private:
m_writer.writeDOMFileSystem(fs->type(), fs->name(), fs->rootURL().string());
return 0;
}
-#endif
void writeFile(v8::Handle<v8::Value> value)
{
@@ -1305,10 +1296,8 @@ Serializer::StateBase* Serializer::doSerialize(v8::Handle<v8::Value> value, Stat
writeFile(value);
else if (V8Blob::HasInstance(value, m_isolate, currentWorldType))
writeBlob(value);
-#if ENABLE(FILE_SYSTEM)
else if (V8DOMFileSystem::HasInstance(value, m_isolate, currentWorldType))
return writeDOMFileSystem(value, next);
-#endif
else if (V8FileList::HasInstance(value, m_isolate, currentWorldType))
writeFileList(value);
else if (V8ImageData::HasInstance(value, m_isolate, currentWorldType))
@@ -1451,13 +1440,11 @@ public:
return false;
creator.pushObjectReference(*value);
break;
-#if ENABLE(FILE_SYSTEM)
case DOMFileSystemTag:
if (!readDOMFileSystem(value))
return false;
creator.pushObjectReference(*value);
break;
-#endif
case FileListTag:
if (!readFileList(value))
return false;
@@ -1882,7 +1869,6 @@ private:
return true;
}
-#if ENABLE(FILE_SYSTEM)
bool readDOMFileSystem(v8::Handle<v8::Value>* value)
{
uint32_t type;
@@ -1898,7 +1884,6 @@ private:
*value = toV8(fs.release(), v8::Handle<v8::Object>(), m_isolate);
return true;
}
-#endif
bool readFile(v8::Handle<v8::Value>* value)
{
« no previous file with comments | « Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp ('k') | Source/WebCore/bindings/v8/custom/V8EntryCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698