Changeset 56968 in webkit


Ignore:
Timestamp:
Apr 1, 2010 10:22:59 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-01 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Dmitry Titov.

Add FileThread for async file operation support in FileReader and FileWriter
​https://bugs.webkit.org/show_bug.cgi?id=36896

Add EANBEL_FILE_READER and ENABLE_FILE_WRITER flags.

  • configure.ac:

2010-04-01 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Dmitry Titov.

Add FileThread for async file operation support in FileReader and FileWriter
​https://bugs.webkit.org/show_bug.cgi?id=36896

Add ENABLE_FILE_READER and ENABLE_FILE_WRITER flags.

  • Configurations/FeatureDefines.xcconfig:

2010-04-01 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Dmitry Titov.

Add FileThread for async file operation support in FileReader and FileWriter
​https://bugs.webkit.org/show_bug.cgi?id=36896

Add FileThread for async file operation support for FileReader and
FileWriter. The patch also adds ENABLE_FILE_READER or
ENABLE_FILE_WRITER build flags/defines. Both flags are disabled
by default.

No new tests, will add ones when after adding modules which use the thread.

  • Configurations/FeatureDefines.xcconfig:
  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • dom/ScriptExecutionContext.cpp: (WebCore::ScriptExecutionContext::~ScriptExecutionContext): (WebCore::ScriptExecutionContext::fileThread):
  • dom/ScriptExecutionContext.h:
  • html/FileThread.cpp: Added. (WebCore::FileThread::FileThread): (WebCore::FileThread::~FileThread): (WebCore::FileThread::start): (WebCore::FileThread::stop): (WebCore::FileThread::postTask): (WebCore::SameFilePredicate::SameFilePredicate): (WebCore::SameFilePredicate::operator()): (WebCore::FileThread::removeTask): (WebCore::FileThread::fileThreadStart): (WebCore::FileThread::runLoop):
  • html/FileThread.h: Added. (WebCore::FileThread::create): (WebCore::FileThread::Task::Task): (WebCore::FileThread::Task::~Task): (WebCore::FileThread::Task::fileHandle):
  • platform/Logging.cpp: (WebCore::): (WebCore::getChannelFromName):
  • platform/Logging.h:

2010-04-01 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Dmitry Titov.

Add FileThread for async file operation support in FileReader and FileWriter
​https://bugs.webkit.org/show_bug.cgi?id=36896

Add ENABLE_FILE_READER and ENABLE_FILE_WRITER flags.

  • features.gypi:

2010-04-01 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Dmitry Titov.

Add FileThread for async file operation support in FileReader and FileWriter
​https://bugs.webkit.org/show_bug.cgi?id=36896

Add FILE_READER or FILE_WRITER feature defines.

  • Configurations/FeatureDefines.xcconfig:

2010-04-01 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Dmitry Titov.

Add FileThread for async file operation support in FileReader and FileWriter
​https://bugs.webkit.org/show_bug.cgi?id=36896

Adds ENABLE_FILE_READER and ENABLE_FILE_WRITER feature flags
for FileReader and FileWriter support.

  • win/tools/vsprops/FeatureDefines.vsprops:
  • win/tools/vsprops/FeatureDefinesCairo.vsprops:

2010-04-01 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Dmitry Titov.

Add FileThread for async file operation support in FileReader and FileWriter
​https://bugs.webkit.org/show_bug.cgi?id=36896

Add options to enable FILE_READER and FILE_WRITER support.

  • Scripts/build-webkit:
Location:
trunk
Files:
2 added
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r56944 r56968  
     12010-04-01  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Dmitry Titov.
     4
     5        Add FileThread for async file operation support in FileReader and FileWriter
     6        https://bugs.webkit.org/show_bug.cgi?id=36896
     7
     8        Add EANBEL_FILE_READER and ENABLE_FILE_WRITER flags.
     9
     10        * configure.ac:
     11
    1122010-04-01  Ojan Vafai  <ojan@chromium.org>
    213

  • trunk/JavaScriptCore/ChangeLog

    r56868 r56968  
     12010-04-01  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Dmitry Titov.
     4
     5        Add FileThread for async file operation support in FileReader and FileWriter
     6        https://bugs.webkit.org/show_bug.cgi?id=36896
     7
     8        Add ENABLE_FILE_READER and ENABLE_FILE_WRITER flags.
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11
    1122010-03-31  Gavin Barraclough  <barraclough@apple.com>
    213

  • trunk/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r55867 r56968  
    5151ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
    5252ENABLE_FILTERS = ENABLE_FILTERS;
     53ENABLE_FILE_READER = ;
     54ENABLE_FILE_WRITER = ;
    5355ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    5456ENABLE_ICONDATABASE = ENABLE_ICONDATABASE;
    … …  
    7678ENABLE_XSLT = ENABLE_XSLT;
    7779
    78 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     80FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_READER) $(ENABLE_FILE_WRITER) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

  • trunk/WebCore/ChangeLog

    r56965 r56968  
     12010-04-01  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Dmitry Titov.
     4
     5        Add FileThread for async file operation support in FileReader and FileWriter
     6        https://bugs.webkit.org/show_bug.cgi?id=36896
     7
     8        Add FileThread for async file operation support for FileReader and
     9        FileWriter.  The patch also adds ENABLE_FILE_READER or
     10        ENABLE_FILE_WRITER build flags/defines.  Both flags are disabled
     11        by default.
     12
     13        No new tests, will add ones when after adding modules which use the thread.
     14
     15        * Configurations/FeatureDefines.xcconfig:
     16        * GNUmakefile.am:
     17        * WebCore.gypi:
     18        * WebCore.pro:
     19        * WebCore.vcproj/WebCore.vcproj:
     20        * WebCore.xcodeproj/project.pbxproj:
     21        * dom/ScriptExecutionContext.cpp:
     22        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
     23        (WebCore::ScriptExecutionContext::fileThread):
     24        * dom/ScriptExecutionContext.h:
     25        * html/FileThread.cpp: Added.
     26        (WebCore::FileThread::FileThread):
     27        (WebCore::FileThread::~FileThread):
     28        (WebCore::FileThread::start):
     29        (WebCore::FileThread::stop):
     30        (WebCore::FileThread::postTask):
     31        (WebCore::SameFilePredicate::SameFilePredicate):
     32        (WebCore::SameFilePredicate::operator()):
     33        (WebCore::FileThread::removeTask):
     34        (WebCore::FileThread::fileThreadStart):
     35        (WebCore::FileThread::runLoop):
     36        * html/FileThread.h: Added.
     37        (WebCore::FileThread::create):
     38        (WebCore::FileThread::Task::Task):
     39        (WebCore::FileThread::Task::~Task):
     40        (WebCore::FileThread::Task::fileHandle):
     41        * platform/Logging.cpp:
     42        (WebCore::):
     43        (WebCore::getChannelFromName):
     44        * platform/Logging.h:
     45
    1462010-04-01  Sheriff Bot  <webkit.review.bot@gmail.com>
    247

  • trunk/WebCore/Configurations/FeatureDefines.xcconfig

    r55867 r56968  
    5151ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
    5252ENABLE_FILTERS = ENABLE_FILTERS;
     53ENABLE_FILE_READER = ;
     54ENABLE_FILE_WRITER = ;
    5355ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    5456ENABLE_ICONDATABASE = ENABLE_ICONDATABASE;
    … …  
    7678ENABLE_XSLT = ENABLE_XSLT;
    7779
    78 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     80FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_READER) $(ENABLE_FILE_WRITER) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

  • trunk/WebCore/GNUmakefile.am

    r56869 r56968  
    10221022        WebCore/html/FileList.cpp \
    10231023        WebCore/html/FileList.h \
     1024        WebCore/html/FileThread.cpp \
     1025        WebCore/html/FileThread.h \
    10241026        WebCore/html/FormDataList.cpp \
    10251027        WebCore/html/FormDataList.h \
    … …  
    35593561endif  # END ENABLE_BLOB_SLICE
    35603562
     3563# ---
     3564# FileReader support
     3565# ---
     3566if ENABLE_FILE_READER
     3567FEATURE_DEFINES += ENABLE_FILE_READER=1
     3568webcore_cppflags += -DENABLE_FILE_READER=1
     3569endif  # END ENABLE_FILE_READER
     3570
     3571# ---
     3572# FileWriter support
     3573# ---
     3574if ENABLE_FILE_WRITER
     3575FEATURE_DEFINES += ENABLE_FILE_WRITER=1
     3576webcore_cppflags += -DENABLE_FILE_WRITER=1
     3577endif  # END ENABLE_FILE_WRITER
    35613578
    35623579DerivedSources/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl

  • trunk/WebCore/WebCore.gypi

    r56869 r56968  
    14271427            'html/FileList.cpp',
    14281428            'html/FileList.h',
     1429            'html/FileThread.cpp',
     1430            'html/FileThread.h',
    14291431            'html/FormDataList.cpp',
    14301432            'html/FormDataList.h',

  • trunk/WebCore/WebCore.pro

    r56922 r56968  
    613613    html/File.cpp \
    614614    html/FileList.cpp \
     615    html/FileThread.cpp \
    615616    html/FormDataList.cpp \
    616617    html/HTMLAllCollection.cpp \
    … …  
    13191320    html/File.h \
    13201321    html/FileList.h \
     1322    html/FileThread.h \
    13211323    html/FormDataList.h \
    13221324    html/HTMLAllCollection.h \

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r56869 r56968  
    3022630226                        </File>
    3022730227                        <File
     30228                                RelativePath="..\html\FileThread.cpp"
     30229                                >
     30230                        </File>
     30231                        <File
     30232                                RelativePath="..\html\FileThread.h"
     30233                                >
     30234                        </File>
     30235                        <File
    3022830236                                RelativePath="..\html\FormDataList.cpp"
    3022930237                                >

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r56869 r56968  
    22082208                85FF315A0AAFBFCB00374F38 /* DOMKeyboardEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85FF31580AAFBFCB00374F38 /* DOMKeyboardEvent.h */; };
    22092209                85FF315B0AAFBFCB00374F38 /* DOMKeyboardEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85FF31590AAFBFCB00374F38 /* DOMKeyboardEvent.mm */; };
     2210                8952535211641B3400CABF00 /* FileThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8952535011641B3400CABF00 /* FileThread.cpp */; };
     2211                8952535311641B3400CABF00 /* FileThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 8952535111641B3400CABF00 /* FileThread.h */; };
    22102212                9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */; };
    22112213                9302B0BF0D79F82C00C7EE83 /* PageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    76487650                85FF31580AAFBFCB00374F38 /* DOMKeyboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMKeyboardEvent.h; sourceTree = "<group>"; };
    76497651                85FF31590AAFBFCB00374F38 /* DOMKeyboardEvent.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMKeyboardEvent.mm; sourceTree = "<group>"; };
     7652                8952535011641B3400CABF00 /* FileThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileThread.cpp; sourceTree = "<group>"; };
     7653                8952535111641B3400CABF00 /* FileThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileThread.h; sourceTree = "<group>"; };
    76507654                9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroup.cpp; sourceTree = "<group>"; };
    76517655                9302B0BE0D79F82C00C7EE83 /* PageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroup.h; sourceTree = "<group>"; };
    … …  
    1292512929                        isa = PBXGroup;
    1292612930                        children = (
     12931                                8952535011641B3400CABF00 /* FileThread.cpp */,
     12932                                8952535111641B3400CABF00 /* FileThread.h */,
    1292712933                                A43BF5961149290A00C643CA /* HTMLProgressElement.cpp */,
    1292812934                                A43BF5971149290A00C643CA /* HTMLProgressElement.h */,
    … …  
    1876918775                                8499A515115FB33000F566E3 /* RenderSVGResourceMarker.h in Headers */,
    1877018776                                2E3BBF081162DA1100B9409A /* UUID.h in Headers */,
     18777                                8952535311641B3400CABF00 /* FileThread.h in Headers */,
    1877118778                        );
    1877218779                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2098320990                                8499A514115FB33000F566E3 /* RenderSVGResourceMarker.cpp in Sources */,
    2098420991                                2E3BBF071162DA1100B9409A /* UUID.cpp in Sources */,
     20992                                8952535211641B3400CABF00 /* FileThread.cpp in Sources */,
    2098520993                        );
    2098620994                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/dom/ScriptExecutionContext.cpp

    r53688 r56968  
    3232#include "DatabaseTask.h"
    3333#include "DatabaseThread.h"
     34#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
     35#include "FileThread.h"
     36#endif
    3437#include "MessagePort.h"
    3538#include "SecurityOrigin.h"
    … …  
    8285        ASSERT(m_databaseThread->terminationRequested());
    8386        m_databaseThread = 0;
     87    }
     88#endif
     89#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
     90    if (m_fileThread) {
     91        m_fileThread->stop();
     92        m_fileThread = 0;
    8493    }
    8594#endif
    … …  
    262271}
    263272
     273#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
     274FileThread* ScriptExecutionContext::fileThread()
     275{
     276    if (!m_fileThread) {
     277        m_fileThread = FileThread::create();
     278        if (!m_fileThread->start())
     279            m_fileThread = 0;
     280    }
     281    return m_fileThread.get();
     282}
     283#endif
     284
    264285ScriptExecutionContext::Task::~Task()
    265286{

  • trunk/WebCore/dom/ScriptExecutionContext.h

    r55771 r56968  
    4646#endif
    4747    class DOMTimer;
     48#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
     49    class FileThread;
     50#endif
    4851    class MessagePort;
    4952    class SecurityOrigin;
    … …  
    137140#endif
    138141
     142#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
     143        FileThread* fileThread();
     144        void stopFileThread();
     145#endif
     146
    139147    protected:
    140148        // Explicitly override the security origin for this script context.
    … …  
    164172        OwnPtr<DatabaseSet> m_openDatabaseSet;
    165173#endif
     174
     175#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
     176        RefPtr<FileThread> m_fileThread;
     177#endif
    166178    };
    167179

  • trunk/WebCore/platform/Logging.cpp

    r55036 r56968  
    2121 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2222 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
     23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    2525
    … …  
    6161WTFLogChannel LogArchives =          { 0x04000000, "WebCoreLogLevel", WTFLogChannelOff };
    6262WTFLogChannel LogProgress =          { 0x08000000, "WebCoreLogLevel", WTFLogChannelOff };
     63WTFLogChannel LogFileAPI =           { 0x10000000, "WebCoreLogLevel", WTFLogChannelOff };
    6364
    6465WTFLogChannel* getChannelFromName(const String& channelName)
    … …  
    114115    if (equalIgnoringCase(channelName, String("Progress")))
    115116        return &LogProgress;
    116        
     117
    117118    if (equalIgnoringCase(channelName, String("SpellingAndGrammar")))
    118119        return &LogSpellingAndGrammar;
    … …  
    130131        return &LogThreading;
    131132
     133    if (equalIgnoringCase(channelName, String("FileAPI")))
     134        return &LogFileAPI;
     135
    132136    return 0;
    133137}

  • trunk/WebCore/platform/Logging.h

    r55036 r56968  
    5959    extern WTFLogChannel LogArchives;
    6060    extern WTFLogChannel LogProgress;
     61    extern WTFLogChannel LogFileAPI;
    6162
    6263    void InitializeLoggingChannelsIfNecessary();

  • trunk/WebKit/chromium/ChangeLog

    r56958 r56968  
     12010-04-01  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Dmitry Titov.
     4
     5        Add FileThread for async file operation support in FileReader and FileWriter
     6        https://bugs.webkit.org/show_bug.cgi?id=36896
     7
     8        Add ENABLE_FILE_READER and ENABLE_FILE_WRITER flags.
     9
     10        * features.gypi:
     11
    1122010-04-01  Finnur Thorarinsson  <finnur.webkit@gmail.com>
    213

  • trunk/WebKit/chromium/features.gypi

    r56201 r56968  
    4848        'ENABLE_DASHBOARD_SUPPORT=0',
    4949        'ENABLE_DOM_STORAGE=1',
     50        'ENABLE_FILE_READER=0',
     51        'ENABLE_FILE_WRITER=0',
    5052        'ENABLE_GEOLOCATION=1',
    5153        'ENABLE_JAVASCRIPT_DEBUGGER=1',

  • trunk/WebKit/mac/ChangeLog

    r56954 r56968  
     12010-04-01  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Dmitry Titov.
     4
     5        Add FileThread for async file operation support in FileReader and FileWriter
     6        https://bugs.webkit.org/show_bug.cgi?id=36896
     7
     8        Add FILE_READER or FILE_WRITER feature defines.
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11
    1122010-04-01  Ada Chan  <adachan@apple.com>
    213

  • trunk/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r55867 r56968  
    5151ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
    5252ENABLE_FILTERS = ENABLE_FILTERS;
     53ENABLE_FILE_READER = ;
     54ENABLE_FILE_WRITER = ;
    5355ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    5456ENABLE_ICONDATABASE = ENABLE_ICONDATABASE;
    … …  
    7678ENABLE_XSLT = ENABLE_XSLT;
    7779
    78 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     80FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_READER) $(ENABLE_FILE_WRITER) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

  • trunk/WebKitLibraries/ChangeLog

    r56607 r56968  
     12010-04-01  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Dmitry Titov.
     4
     5        Add FileThread for async file operation support in FileReader and FileWriter
     6        https://bugs.webkit.org/show_bug.cgi?id=36896
     7
     8        Adds ENABLE_FILE_READER and ENABLE_FILE_WRITER feature flags
     9        for FileReader and FileWriter support.
     10
     11        * win/tools/vsprops/FeatureDefines.vsprops:
     12        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
     13
    1142010-03-25  Mark Rowe  <mrowe@apple.com>
    215

  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

    r55670 r56968  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB_SLICE);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_RUBY);$(ENABLE_SANDBOX);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
     12                PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB_SLICE);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_READER);$(ENABLE_FILE_WRITER);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_RUBY);$(ENABLE_SANDBOX);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
    1313        />
    1414  <UserMacro
    … …  
    6565                Name="ENABLE_FILTERS"
    6666                Value="ENABLE_FILTERS"
     67                PerformEnvironmentSet="true"
     68        />
     69  <UserMacro
     70                Name="ENABLE_FILE_READER"
     71                Value=""
     72                PerformEnvironmentSet="true"
     73        />
     74  <UserMacro
     75                Name="ENABLE_FILE_WRITER"
     76                Value=""
    6777                PerformEnvironmentSet="true"
    6878        />

  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops

    r55670 r56968  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB_SLICE);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
     12                PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB_SLICE);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_READER);$(ENABLE_FILE_WRITER);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
    1313        />
    1414  <UserMacro
    … …  
    6565                Name="ENABLE_FILTERS"
    6666                Value="ENABLE_FILTERS"
     67                PerformEnvironmentSet="true"
     68        />
     69  <UserMacro
     70                Name="ENABLE_FILE_READER"
     71                Value=""
     72                PerformEnvironmentSet="true"
     73        />
     74  <UserMacro
     75                Name="ENABLE_FILE_WRITER"
     76                Value=""
    6777                PerformEnvironmentSet="true"
    6878        />

  • trunk/WebKitTools/ChangeLog

    r56966 r56968  
     12010-04-01  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Dmitry Titov.
     4
     5        Add FileThread for async file operation support in FileReader and FileWriter
     6        https://bugs.webkit.org/show_bug.cgi?id=36896
     7
     8        Add options to enable FILE_READER and FILE_WRITER support.
     9
     10        * Scripts/build-webkit:
     11
    1122010-04-01  Kent Tamura  <tkent@chromium.org>
    213

  • trunk/WebKitTools/Scripts/build-webkit

    r56227 r56968  
    5757    $svgSupport, $svgAnimationSupport, $svgAsImageSupport, $svgDOMObjCBindingsSupport, $svgFontsSupport,
    5858    $svgForeignObjectSupport, $svgUseSupport, $videoSupport, $webSocketsSupport, $wmlSupport, $wcssSupport, $xhtmlmpSupport, $workersSupport,
    59     $xpathSupport, $xsltSupport, $coverageSupport, $notificationsSupport, $blobSliceSupport, $tiledBackingStoreSupport);
     59    $xpathSupport, $xsltSupport, $coverageSupport, $notificationsSupport, $blobSliceSupport, $tiledBackingStoreSupport,
     60    $fileReaderSupport, $fileWriterSupport);
    6061
    6162my @features = (
    … …  
    176177    { option => "xslt", desc => "Toggle XSLT support",
    177178      define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
     179
     180    { option => "file-reader", desc => "Toggle FileReader support",
     181      define => "ENABLE_FILE_READER", default => 0, value => \$fileReaderSupport },
     182
     183    { option => "file-writer", desc => "Toggle FileWriter support",
     184      define => "ENABLE_FILE_WRITER", default => 0, value => \$fileWriterSupport },
    178185);
    179186

  • trunk/configure.ac

    r56083 r56968  
    570570AC_MSG_RESULT([$enable_fast_mobile_scrolling])
    571571
     572# check whether to enable FileReader support
     573AC_MSG_CHECKING([whether to enable FileReader support])
     574AC_ARG_ENABLE(file_reader,
     575              AC_HELP_STRING([--enable-file-reader],
     576                             [enable support for FileReader [default=no]]),
     577              [],[enable_file_reader="no"])
     578AC_MSG_RESULT([$enable_file_reader])
     579
     580# check whether to enable FileWriter support
     581AC_MSG_CHECKING([whether to enable FileWriter support])
     582AC_ARG_ENABLE(file_writer,
     583              AC_HELP_STRING([--enable-file-writer],
     584                             [enable support for FileWriter [default=no]]),
     585              [],[enable_file_writer="no"])
     586AC_MSG_RESULT([$enable_file_writer])
     587
    572588# check whether to enable code coverage
    573589AC_MSG_CHECKING([whether to enable code coverage support])
    … …  
    808824AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
    809825AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
     826AM_CONDITIONAL([ENABLE_FILE_READER],[test "$enable_file_reader" = "yes"])
     827AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"])
    810828AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
    811829AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
    … …  
    861879 JIT compilation                                          : $enable_jit
    862880 Filters support                                          : $enable_filters
     881 FileReader support                                       : $enable_file_reader
     882 FileWriter support                                       : $enable_file_writer
    863883 Geolocation support                                      : $enable_geolocation
    864884 JavaScript debugger/profiler support                     : $enable_javascript_debugger
Note: See TracChangeset for help on using the changeset viewer.