Remove ENABLE(FILE_SYSTEM) compile-time flag.

Source/WebCore/bindings/v8/SerializedScriptValue.cpp

 /*
  * Copyright (C) 2010 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 #include "File.h"
 #include "FileList.h"
 #include "ImageData.h"
 #include "MessagePort.h"
 #include "SharedBuffer.h"
 #include "V8ArrayBuffer.h"
 #include "V8ArrayBufferCustom.h"
 #include "V8ArrayBufferView.h"
 #include "V8Binding.h"
 #include "V8Blob.h"
+#include "V8DOMFileSystem.h"
 #include "V8DataView.h"
 #include "V8File.h"
 #include "V8FileList.h"
 #include "V8Float32Array.h"
 #include "V8Float64Array.h"
 #include "V8ImageData.h"
 #include "V8Int16Array.h"
 #include "V8Int32Array.h"
 #include "V8Int8Array.h"
 #include "V8MessagePort.h"
@@ skipping 12 matching lines @@
 #include <wtf/Int16Array.h>
 #include <wtf/Int32Array.h>
 #include <wtf/Int8Array.h>
 #include <wtf/RefCounted.h>
 #include <wtf/Uint16Array.h>
 #include <wtf/Uint32Array.h>
 #include <wtf/Uint8Array.h>
 #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!
 
 namespace WebCore {
 
 namespace {
 
 // This code implements the HTML5 Structured Clone algorithm:
 // http://www.whatwg.org/specs/web-apps/current-work/multipage/urls.html#safe-passing-of-structured-data
 
@@ skipping 94 matching lines @@
     FalseTag = 'F', // -> <false>
     StringTag = 'S', // string:RawString -> string
     StringUCharTag = 'c', // string:RawUCharString -> string
     Int32Tag = 'I', // value:ZigZag-encoded int32 -> Integer
     Uint32Tag = 'U', // value:uint32_t -> Integer
     DateTag = 'D', // value:double -> Date (ref)
     MessagePortTag = 'M', // index:int -> MessagePort. Fills the result with transferred MessagePort.
     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;
                      //                           fills it with the last numProperties name,value pairs pushed onto the deserialization stack
     SparseArrayTag = '@', // numProperties:uint32_t, length:uint32_t -> pops the last object from the open stack;
                           //                                            fills it with the last numProperties name,value pairs pushed onto the deserialization stack
     DenseArrayTag = '$', // numProperties:uint32_t, length:uint32_t -> pops the last object from the open stack;
                          //                                            fills it with the last length elements and numProperties name,value pairs pushed onto deserialization stack
     RegExpTag = 'R', // pattern:RawString, flags:uint32_t -> RegExp (ref)
     ArrayBufferTag = 'B', // byteLength:uint32_t, data:byte[byteLength] -> ArrayBuffer (ref)
@@ skipping 194 matching lines @@
     }
 
     void writeBlob(const String& url, const String& type, unsigned long long size)
     {
         append(BlobTag);
         doWriteWebCoreString(url);
         doWriteWebCoreString(type);
         doWriteUint64(size);
     }
 
-#if ENABLE(FILE_SYSTEM)
     void writeDOMFileSystem(int type, const String& name, const String& url)
     {
         append(DOMFileSystemTag);
         doWriteUint32(type);
         doWriteWebCoreString(name);
         doWriteWebCoreString(url);
     }
-#endif
 
     void writeFile(const String& path, const String& url, const String& type)
     {
         append(FileTag);
         doWriteWebCoreString(path);
         doWriteWebCoreString(url);
         doWriteWebCoreString(type);
     }
 
     void writeFileList(const FileList& fileList)
@@ skipping 648 matching lines @@
 
     void writeBlob(v8::Handle<v8::Value> value)
     {
         Blob* blob = V8Blob::toNative(value.As<v8::Object>());
         if (!blob)
             return;
         m_writer.writeBlob(blob->url().string(), blob->type(), blob->size());
         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>());
         if (!fs)
             return 0;
         if (!fs->clonable())
             return handleError(DataCloneError, next);
         m_writer.writeDOMFileSystem(fs->type(), fs->name(), fs->rootURL().string());
         return 0;
     }
-#endif
 
     void writeFile(v8::Handle<v8::Value> value)
     {
         File* file = V8File::toNative(value.As<v8::Object>());
         if (!file)
             return;
         m_writer.writeFile(file->path(), file->url().string(), file->type());
         m_blobURLs.append(file->url().string());
     }
 
@@ skipping 184 matching lines @@
         else if (value->IsNumberObject())
             writeNumberObject(value);
         else if (value->IsBooleanObject())
             writeBooleanObject(value);
         else if (value->IsArray()) {
             return startArrayState(value.As<v8::Array>(), next);
         } else if (V8File::HasInstance(value, m_isolate, currentWorldType))
             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))
             writeImageData(value);
         else if (value->IsRegExp())
             writeRegExp(value);
         else if (V8ArrayBuffer::HasInstance(value, m_isolate, currentWorldType))
             return writeArrayBuffer(value, next);
         else if (value->IsObject()) {
             if (isHostObject(jsObject) || jsObject->IsCallable() || value->IsNativeError())
@@ skipping 122 matching lines @@
         case BlobTag:
             if (!readBlob(value))
                 return false;
             creator.pushObjectReference(*value);
             break;
         case FileTag:
             if (!readFile(value))
                 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;
             creator.pushObjectReference(*value);
             break;
         case ImageDataTag:
             if (!readImageData(value))
                 return false;
             creator.pushObjectReference(*value);
             break;
@@ skipping 404 matching lines @@
             return false;
         if (!readWebCoreString(&type))
             return false;
         if (!doReadUint64(&size))
             return false;
         PassRefPtr<Blob> blob = Blob::create(KURL(ParsedURLString, url), type, size);
         *value = toV8(blob, v8::Handle<v8::Object>(), m_isolate);
         return true;
     }
 
-#if ENABLE(FILE_SYSTEM)
     bool readDOMFileSystem(v8::Handle<v8::Value>* value)
     {
         uint32_t type;
         String name;
         String url;
         if (!doReadUint32(&type))
             return false;
         if (!readWebCoreString(&name))
             return false;
         if (!readWebCoreString(&url))
             return false;
         RefPtr<DOMFileSystem> fs = DOMFileSystem::create(getScriptExecutionContext(), name, static_cast<WebCore::FileSystemType>(type), KURL(ParsedURLString, url), AsyncFileSystem::create());
         *value = toV8(fs.release(), v8::Handle<v8::Object>(), m_isolate);
         return true;
     }
-#endif
 
     bool readFile(v8::Handle<v8::Value>* value)
     {
         String path;
         String url;
         String type;
         if (!readWebCoreString(&path))
             return false;
         if (!readWebCoreString(&url))
             return false;
@@ skipping 605 matching lines @@
         v8::V8::AdjustAmountOfExternalAllocatedMemory(-m_externallyAllocatedMemory);
     }
 }
 
 uint32_t SerializedScriptValue::wireFormatVersion()
 {
     return WebCore::wireFormatVersion;
 }
 
 } // namespace WebCore