Changeset 84224 in webkit


Ignore:
Timestamp:
Apr 18, 2011 10:36:36 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-18 Taiju TSUIKI <​develop@tzik.jp>

Reviewed by Darin Fisher.

Vendor-prefix requestFileSystem in FileSystem API
​https://bugs.webkit.org/show_bug.cgi?id=58517

Prefix from:

  • window.requestFileSystem to window.webkitRequestFileSystem
  • window.resolveLocalFileSystemURL to window.webkitResolveLocalFileSystemURL
  • window.Flags to window.WebKitFlags
  • WorkerContext.requestFileSystem to WorkerContext.webkitRequestFileSystem
  • WorkerContext.resolveLocalFileSystemURL to WorkerContext.webkitResolveLocalFileSystemURL
  • WorkerContext.Flags to WorkerContext.WebKitFlags
  • fast/dom/script-tests/prototype-inheritance.js:
  • fast/filesystem/flags-passing-expected.txt:
  • fast/filesystem/resources/async-operations.js:
  • fast/filesystem/resources/directory-entry-to-uri.js:
  • fast/filesystem/resources/file-entry-to-uri-sync.js:
  • fast/filesystem/resources/file-entry-to-uri.js:
  • fast/filesystem/resources/file-from-file-entry-sync.js:
  • fast/filesystem/resources/file-from-file-entry.js:
  • fast/filesystem/resources/file-writer-sync-truncate-extend.js:
  • fast/filesystem/resources/file-writer-sync-write-overlapped.js:
  • fast/filesystem/resources/file-writer-utils.js:
  • fast/filesystem/resources/fs-worker-common.js:
  • fast/filesystem/resources/op-tests-helper.js:
  • fast/filesystem/resources/simple-persistent-sync.js:
  • fast/filesystem/resources/simple-persistent.js:
  • fast/filesystem/resources/simple-temporary-sync.js:
  • fast/filesystem/resources/simple-temporary.js:
  • fast/filesystem/resources/sync-operations.js:
  • fast/filesystem/script-tests/filesystem-reference.js:
  • fast/filesystem/script-tests/flags-passing.js:
  • fast/filesystem/script-tests/read-directory.js:
  • http/tests/filesystem/resolve-uri-expected.txt:
  • http/tests/filesystem/script-tests/resolve-uri.js:
  • http/tests/filesystem/workers/resolve-url-expected.txt:
  • http/tests/filesystem/workers/script-tests/resolve-url-sync.js:
  • platform/chromium/fast/dom/prototype-inheritance-expected.txt:

2011-04-18 Taiju TSUIKI <​develop@tzik.jp>

Reviewed by Darin Fisher.

Vendor-prefix requestFileSystem in FileSystem API
​https://bugs.webkit.org/show_bug.cgi?id=58517

Prefix from:

  • window.requestFileSystem to window.webkitRequestFileSystem
  • window.resolveLocalFileSystemURL to window.webkitResolveLocalFileSystemURL
  • window.Flags to window.WebKitFlags
  • WorkerContext.requestFileSystem to WorkerContext.webkitRequestFileSystem
  • WorkerContext.resolveLocalFileSystemURL to WorkerContext.webkitResolveLocalFileSystemURL
  • WorkerContext.Flags to WorkerContext.WebKitFlags
  • CMakeLists.txt:
  • CodeGenerators.pri:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSDirectoryEntryCustom.cpp: (WebCore::JSDirectoryEntry::getFile): (WebCore::JSDirectoryEntry::getDirectory):
  • bindings/js/JSDirectoryEntrySyncCustom.cpp: (WebCore::getFlags): (WebCore::JSDirectoryEntrySync::getFile): (WebCore::JSDirectoryEntrySync::getDirectory):
  • bindings/v8/custom/V8DirectoryEntryCustom.cpp: (WebCore::V8DirectoryEntry::getDirectoryCallback): (WebCore::V8DirectoryEntry::getFileCallback):
  • bindings/v8/custom/V8DirectoryEntrySyncCustom.cpp: (WebCore::getFlags): (WebCore::V8DirectoryEntrySync::getDirectoryCallback): (WebCore::V8DirectoryEntrySync::getFileCallback):
  • fileapi/DOMFileSystemBase.cpp: (WebCore::DOMFileSystemBase::getFile): (WebCore::DOMFileSystemBase::getDirectory):
  • fileapi/DOMFileSystemBase.h:
  • fileapi/DirectoryEntry.cpp: (WebCore::DirectoryEntry::getFile): (WebCore::DirectoryEntry::getDirectory):
  • fileapi/DirectoryEntry.h:
  • fileapi/DirectoryEntry.idl:
  • fileapi/DirectoryEntrySync.cpp: (WebCore::DirectoryEntrySync::getFile): (WebCore::DirectoryEntrySync::getDirectory):
  • fileapi/DirectoryEntrySync.h:
  • fileapi/DirectoryEntrySync.idl:
  • fileapi/WebKitFlags.h: Renamed from Source/WebCore/fileapi/Flags.h. (WebCore::WebKitFlags::create): (WebCore::WebKitFlags::isCreate): (WebCore::WebKitFlags::setCreate): (WebCore::WebKitFlags::isExclusive): (WebCore::WebKitFlags::setExclusive): (WebCore::WebKitFlags::WebKitFlags):
  • fileapi/WebKitFlags.idl: Renamed from Source/WebCore/fileapi/Flags.idl.
  • page/DOMWindow.cpp: (WebCore::DOMWindow::webkitRequestFileSystem): (WebCore::DOMWindow::webkitResolveLocalFileSystemURL):
  • page/DOMWindow.h:
  • page/DOMWindow.idl:
  • workers/WorkerContext.cpp: (WebCore::WorkerContext::webkitRequestFileSystem): (WebCore::WorkerContext::webkitRequestFileSystemSync): (WebCore::WorkerContext::webkitResolveLocalFileSystemURL): (WebCore::WorkerContext::webkitResolveLocalFileSystemSyncURL):
  • workers/WorkerContext.h:
  • workers/WorkerContext.idl:
Location:
trunk
Files:
55 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r84223 r84224  
     12011-04-18  Taiju TSUIKI  <develop@tzik.jp>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Vendor-prefix requestFileSystem in FileSystem API
     6        https://bugs.webkit.org/show_bug.cgi?id=58517
     7
     8        Prefix from:
     9        - window.requestFileSystem to window.webkitRequestFileSystem
     10        - window.resolveLocalFileSystemURL to window.webkitResolveLocalFileSystemURL
     11        - window.Flags to window.WebKitFlags
     12        - WorkerContext.requestFileSystem to WorkerContext.webkitRequestFileSystem
     13        - WorkerContext.resolveLocalFileSystemURL to WorkerContext.webkitResolveLocalFileSystemURL
     14        - WorkerContext.Flags to WorkerContext.WebKitFlags
     15
     16        * fast/dom/script-tests/prototype-inheritance.js:
     17        * fast/filesystem/flags-passing-expected.txt:
     18        * fast/filesystem/resources/async-operations.js:
     19        * fast/filesystem/resources/directory-entry-to-uri.js:
     20        * fast/filesystem/resources/file-entry-to-uri-sync.js:
     21        * fast/filesystem/resources/file-entry-to-uri.js:
     22        * fast/filesystem/resources/file-from-file-entry-sync.js:
     23        * fast/filesystem/resources/file-from-file-entry.js:
     24        * fast/filesystem/resources/file-writer-sync-truncate-extend.js:
     25        * fast/filesystem/resources/file-writer-sync-write-overlapped.js:
     26        * fast/filesystem/resources/file-writer-utils.js:
     27        * fast/filesystem/resources/fs-worker-common.js:
     28        * fast/filesystem/resources/op-tests-helper.js:
     29        * fast/filesystem/resources/simple-persistent-sync.js:
     30        * fast/filesystem/resources/simple-persistent.js:
     31        * fast/filesystem/resources/simple-temporary-sync.js:
     32        * fast/filesystem/resources/simple-temporary.js:
     33        * fast/filesystem/resources/sync-operations.js:
     34        * fast/filesystem/script-tests/filesystem-reference.js:
     35        * fast/filesystem/script-tests/flags-passing.js:
     36        * fast/filesystem/script-tests/read-directory.js:
     37        * http/tests/filesystem/resolve-uri-expected.txt:
     38        * http/tests/filesystem/script-tests/resolve-uri.js:
     39        * http/tests/filesystem/workers/resolve-url-expected.txt:
     40        * http/tests/filesystem/workers/script-tests/resolve-url-sync.js:
     41        * platform/chromium/fast/dom/prototype-inheritance-expected.txt:
     42
    1432011-04-18  Daniel Bates  <dbates@rim.com>
    244

  • trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance.js

    r83884 r84224  
    2727    "DeviceMotionEvent",
    2828    "TEMPORARY", "PERSISTENT",
    29     "Flags",
     29    "WebKitFlags",
    3030    "v8Locale",
    3131    // Ignore this property because it only appears in debug builds.

  • trunk/LayoutTests/fast/filesystem/flags-passing-expected.txt

    r69178 r84224  
    44
    55
    6 * Passing a Flags object.
    7 * Recycling the same Flags object.
    8 * Passing a Flags object (with exclusive=true).
     6* Passing a WebKitFlags object.
     7* Recycling the same WebKitFlags object.
     8* Passing a WebKitFlags object (with exclusive=true).
    99* Passing JSON Flags object.
    1010* Passing JSON Flags object (with exclusive=true).
    11 * Passing null as a Flags parameter.
     11* Passing null as a WebKitFlags parameter.
    1212Finished running tests.
    1313PASS expectedCallbacksCount is 3

  • trunk/LayoutTests/fast/filesystem/resources/async-operations.js

    r69485 r84224  
    9191}
    9292
    93 if (this.requestFileSystem) {
     93if (this.webkitRequestFileSystem) {
    9494    jsTestIsAsync = true;
    9595    var helper = new JoinHelper();
    9696    helper.run(function() {
    97     requestFileSystem.apply(this, [this.TEMPORARY, 100, function(fs) {
     97    webkitRequestFileSystem.apply(this, [this.TEMPORARY, 100, function(fs) {
    9898        debug("Got FileSystem:" + fs.name);
    9999        fileSystem = fs;

  • trunk/LayoutTests/fast/filesystem/resources/directory-entry-to-uri.js

    r81438 r84224  
    3131
    3232var jsTestIsAsync = true;
    33 requestFileSystem(TEMPORARY, 100, fileSystemCallback, errorCallback);
     33webkitRequestFileSystem(TEMPORARY, 100, fileSystemCallback, errorCallback);
    3434var successfullyParsed = true;

  • trunk/LayoutTests/fast/filesystem/resources/file-entry-to-uri-sync.js

    r81438 r84224  
    33description("Obtaining URL from FileEntry.");
    44
    5 var fileSystem = requestFileSystemSync(TEMPORARY, 100);
     5var fileSystem = webkitRequestFileSystemSync(TEMPORARY, 100);
    66removeAllInDirectorySync(fileSystem.root);
    77

  • trunk/LayoutTests/fast/filesystem/resources/file-entry-to-uri.js

    r81438 r84224  
    3131
    3232var jsTestIsAsync = true;
    33 requestFileSystem(TEMPORARY, 100, fileSystemCallback, errorCallback);
     33webkitRequestFileSystem(TEMPORARY, 100, fileSystemCallback, errorCallback);
    3434var successfullyParsed = true;

  • trunk/LayoutTests/fast/filesystem/resources/file-from-file-entry-sync.js

    r69907 r84224  
    44description("Obtaining File from FileEntrySync.");
    55
    6 var fileSystem = requestFileSystemSync(this.TEMPORARY, 100);
     6var fileSystem = webkitRequestFileSystemSync(this.TEMPORARY, 100);
    77removeAllInDirectorySync(fileSystem.root);
    88

  • trunk/LayoutTests/fast/filesystem/resources/file-from-file-entry.js

    r69907 r84224  
    3939
    4040var jsTestIsAsync = true;
    41 requestFileSystem(TEMPORARY, 100, fileSystemCallback, errorCallback);
     41webkitRequestFileSystem(TEMPORARY, 100, fileSystemCallback, errorCallback);
    4242var successfullyParsed = true;

  • trunk/LayoutTests/fast/filesystem/resources/file-writer-sync-truncate-extend.js

    r83884 r84224  
    88
    99// Start with an empty FileSystem.
    10 var fileSystem = requestFileSystemSync(this.TEMPORARY, 100);
     10var fileSystem = webkitRequestFileSystemSync(this.TEMPORARY, 100);
    1111removeAllInDirectorySync(fileSystem.root);
    1212

  • trunk/LayoutTests/fast/filesystem/resources/file-writer-sync-write-overlapped.js

    r83884 r84224  
    88
    99// Start with an empty FileSystem.
    10 var fileSystem = requestFileSystemSync(this.TEMPORARY, 100);
     10var fileSystem = webkitRequestFileSystemSync(this.TEMPORARY, 100);
    1111removeAllInDirectorySync(fileSystem.root);
    1212

  • trunk/LayoutTests/fast/filesystem/resources/file-writer-utils.js

    r83884 r84224  
    162162function setupAndRunTest(size, testName, testFunc)
    163163{
    164     if (!requestFileSystem) {
     164    if (!webkitRequestFileSystem) {
    165165        debug("This test requires FileSystem API support.");
    166166        return;
    167167    }
    168168    debug("starting test");
    169     requestFileSystem(TEMPORARY, size, function(fs) {
     169    webkitRequestFileSystem(TEMPORARY, size, function(fs) {
    170170        createEmptyFile(fs, testName, testFunc);
    171171    }, onError);
    172172}
    173 

  • trunk/LayoutTests/fast/filesystem/resources/fs-worker-common.js

    r72704 r84224  
    5151}
    5252
    53 if (this.importScripts && !this.requestFileSystem) {
     53if (this.importScripts && !this.webkitRequestFileSystem) {
    5454    debug('This test requires FileSystem API.');
    5555    finishJSTest();

  • trunk/LayoutTests/fast/filesystem/resources/op-tests-helper.js

    r75236 r84224  
    392392
    393393var jsTestIsAsync = true;
    394 requestFileSystem(TEMPORARY, 100, fileSystemCallback, errorCallback);
     394webkitRequestFileSystem(TEMPORARY, 100, fileSystemCallback, errorCallback);
    395395var successfullyParsed = true;
    396 

  • trunk/LayoutTests/fast/filesystem/resources/simple-persistent-sync.js

    r69249 r84224  
    44}
    55
    6 description("requestFileSystemSync PERSISTENT test.");
     6description("webkitRequestFileSystemSync PERSISTENT test.");
    77
    8 var fileSystem = requestFileSystemSync(PERSISTENT, 100);
     8var fileSystem = webkitRequestFileSystemSync(PERSISTENT, 100);
    99
    1010debug("Successfully obtained PERSISTENT FileSystem:" + fileSystem.name);

  • trunk/LayoutTests/fast/filesystem/resources/simple-persistent.js

    r69249 r84224  
    2222
    2323var jsTestIsAsync = true;
    24 requestFileSystem(PERSISTENT, 100, successCallback, errorCallback);
     24webkitRequestFileSystem(PERSISTENT, 100, successCallback, errorCallback);
    2525var successfullyParsed = true;

  • trunk/LayoutTests/fast/filesystem/resources/simple-temporary-sync.js

    r69249 r84224  
    66description("requestFileSystemSync TEMPORARY test.");
    77
    8 var fileSystem = requestFileSystemSync(TEMPORARY, 100);
     8var fileSystem = webkitRequestFileSystemSync(TEMPORARY, 100);
    99
    1010debug("Successfully obtained TEMPORARY FileSystem:" + fileSystem.name);

  • trunk/LayoutTests/fast/filesystem/resources/simple-temporary.js

    r69249 r84224  
    2222
    2323var jsTestIsAsync = true;
    24 requestFileSystem(TEMPORARY, 100, successCallback, errorCallback);
     24webkitRequestFileSystem(TEMPORARY, 100, successCallback, errorCallback);
    2525var successfullyParsed = true;

  • trunk/LayoutTests/fast/filesystem/resources/sync-operations.js

    r69485 r84224  
    66description("Test making multiple synchronous FileSystem operations.");
    77
    8 var fileSystem = requestFileSystemSync(this.TEMPORARY, 100);
     8var fileSystem = webkitRequestFileSystemSync(this.TEMPORARY, 100);
    99removeAllInDirectorySync(fileSystem.root);
    1010

  • trunk/LayoutTests/fast/filesystem/script-tests/filesystem-reference.js

    r70741 r84224  
    6464}
    6565
    66 if (window.requestFileSystem) {
     66if (window.webkitRequestFileSystem) {
    6767    window.jsTestIsAsync = true;
    68     requestFileSystem(window.TEMPORARY, 100, fileSystemCallback, errorCallback);
     68    webkitRequestFileSystem(window.TEMPORARY, 100, fileSystemCallback, errorCallback);
    6969} else
    7070    debug("This test requires FileSystem API support.");

  • trunk/LayoutTests/fast/filesystem/script-tests/flags-passing.js

    r69249 r84224  
    3535// Test body functions ----------------------------------------------------
    3636function runNullTest(v) {
    37     debug("* Passing null as a Flags parameter.");
     37    debug("* Passing null as a WebKitFlags parameter.");
    3838
    3939    // This should be ok and we treat it as {false, false} Flags.
    … …  
    4242
    4343function runObjectTest(v) {
    44     debug("* Passing a Flags object.");
    45     var flags = new Flags();
     44    debug("* Passing a WebKitFlags object.");
     45    var flags = new WebKitFlags();
    4646    flags.create = false;
    4747
    4848    fileSystem.root.getFile(testFileName, flags, unexpected, expected);
    4949
    50     debug("* Recycling the same Flags object.");
     50    debug("* Recycling the same WebKitFlags object.");
    5151
    5252    fileSystem.root.getFile(testFileName, flags, unexpected, expected);
    … …  
    5757
    5858function runObjectTestWithExclusive(v) {
    59     debug("* Passing a Flags object (with exclusive=true).");
    60     var flags = new Flags;
     59    debug("* Passing a WebKitFlags object (with exclusive=true).");
     60    var flags = new WebKitFlags;
    6161    flags.create = true;
    6262    flags.exclusive = true;
    … …  
    9494}
    9595
    96 if (window.requestFileSystem) {
     96if (window.webkitRequestFileSystem) {
    9797    window.jsTestIsAsync = true;
    98     requestFileSystem(window.TEMPORARY, 100, fileSystemCallback, errorCallback);
     98    webkitRequestFileSystem(window.TEMPORARY, 100, fileSystemCallback, errorCallback);
    9999} else
    100100    debug("This test requires FileSystem API support.");

  • trunk/LayoutTests/fast/filesystem/script-tests/read-directory.js

    r69485 r84224  
    8989}
    9090
    91 if (window.requestFileSystem) {
    92     requestFileSystem(window.TEMPORARY, 100, successCallback, errorCallback);
     91if (window.webkitRequestFileSystem) {
     92    webkitRequestFileSystem(window.TEMPORARY, 100, successCallback, errorCallback);
    9393    window.jsTestIsAsync = true;
    9494} else

  • trunk/LayoutTests/http/tests/filesystem/resolve-uri-expected.txt

    r81848 r84224  
    1 Tests using resolveLocalFileSystemURL to obtain an Entry from a URL
     1Tests using webkitResolveLocalFileSystemURL to obtain an Entry from a URL
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

  • trunk/LayoutTests/http/tests/filesystem/script-tests/resolve-uri.js

    r81848 r84224  
    44}
    55
    6 description("Tests using resolveLocalFileSystemURL to obtain an Entry from a URL");
     6description("Tests using webkitResolveLocalFileSystemURL to obtain an Entry from a URL");
    77
    88var testFileName = '/testFile';
    … …  
    5858    debug("* Resolving a generated URL.");
    5959    createTestFile(function(entry) {
    60         resolveLocalFileSystemURL(entry.toURL(), function(e) {
     60        webkitResolveLocalFileSystemURL(entry.toURL(), function(e) {
    6161            assertPathsMatch(entry.fullPath, e.fullPath);
    6262            assertIsFile(e);
    … …  
    6969    debug("* Resolving test file by hand");
    7070    createTestFile(function(entry) {
    71         resolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporary/testFile", function(e) {
     71        webkitResolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporary/testFile", function(e) {
    7272            assertPathsMatch(testFileName, e.fullPath);
    7373            assertIsFile(e);
    … …  
    7979function runWrongDomain() {
    8080    debug("* Resolving a URL with the wrong security origin (domain)");
    81     resolveLocalFileSystemURL("filesystem:http://localhost:8000/temporary/foo", errorCallback, expectSecurityErrAndRunNext);
     81    webkitResolveLocalFileSystemURL("filesystem:http://localhost:8000/temporary/foo", errorCallback, expectSecurityErrAndRunNext);
    8282}
    8383
    8484function runWrongPort() {
    8585    debug("* Resolving a URL with the wrong security origin (port)");
    86     resolveLocalFileSystemURL("filesystem:http://127.0.0.1:8080/temporary/foo", errorCallback, expectSecurityErrAndRunNext);
     86    webkitResolveLocalFileSystemURL("filesystem:http://127.0.0.1:8080/temporary/foo", errorCallback, expectSecurityErrAndRunNext);
    8787}
    8888
    8989function runWrongScheme() {
    9090    debug("* Resolving a URL with the wrong security origin (scheme)");
    91     resolveLocalFileSystemURL("filesystem:https://127.0.0.1:8000/temporary/foo", errorCallback, expectSecurityErrAndRunNext);
     91    webkitResolveLocalFileSystemURL("filesystem:https://127.0.0.1:8000/temporary/foo", errorCallback, expectSecurityErrAndRunNext);
    9292}
    9393
    9494function runBogusURL() {
    9595    debug("* Resolving a completely bogus URL.");
    96     resolveLocalFileSystemURL("foo", errorCallback, expectEncodingErrAndRunNext);
     96    webkitResolveLocalFileSystemURL("foo", errorCallback, expectEncodingErrAndRunNext);
    9797}
    9898
    9999function runWrongProtocol() {
    100100    debug("* Resolving a URL with the wrong protocol");
    101     resolveLocalFileSystemURL("http://127.0.0.1:8000/foo/bar/baz", errorCallback, expectEncodingErrAndRunNext);
     101    webkitResolveLocalFileSystemURL("http://127.0.0.1:8000/foo/bar/baz", errorCallback, expectEncodingErrAndRunNext);
    102102}
    103103
    … …  
    105105    debug("* Resolving a URL with no slash between type and file");
    106106    createTestFile(function(entry) {
    107         resolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporarytestFile", errorCallback, expectEncodingErrAndRunNext);
     107        webkitResolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporarytestFile", errorCallback, expectEncodingErrAndRunNext);
    108108    });
    109109}
    … …  
    112112    debug("* Resolving a URL with no slash between protocol and type (bogus port)");
    113113    createTestFile(function(entry) {
    114         resolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000temporary/testFile", errorCallback, expectSecurityErrAndRunNext);
     114        webkitResolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000temporary/testFile", errorCallback, expectSecurityErrAndRunNext);
    115115    });
    116116}
    … …  
    120120    fileSystem.root.getDirectory("foo", {create:true}, function(entry) {
    121121        entry.getFile("testFile", {create:true}, function(f) {
    122             resolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporary/foo\\testFile", function(e) {
     122            webkitResolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporary/foo\\testFile", function(e) {
    123123                assertPathsMatch("/foo/testFile", e.fullPath);
    124124                assertIsFile(e);
    … …  
    132132    debug("* Resolve a directory");
    133133    fileSystem.root.getDirectory("foo", {create:true}, function(entry) {
    134         resolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporary/foo", function(e) {
     134        webkitResolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporary/foo", function(e) {
    135135            assertPathsMatch("/foo", e.fullPath);
    136136            assertIsDirectory(e);
    … …  
    143143    debug("* Resolve a path using a trailing slash");
    144144    fileSystem.root.getDirectory("foo", {create:true}, function(entry) {
    145         resolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporary/foo/", function(e) {
     145        webkitResolveLocalFileSystemURL("filesystem:http://127.0.0.1:8000/temporary/foo/", function(e) {
    146146            assertPathsMatch("/foo", e.fullPath);
    147147            assertIsDirectory(e);
    … …  
    153153function runPersistentTest() {
    154154    debug("* Resolving a persistent URL.");
    155     requestFileSystem(PERSISTENT, 100, function(fs) {
    156         resolveLocalFileSystemURL(fs.root.toURL(), function(entry) {
     155    webkitRequestFileSystem(PERSISTENT, 100, function(fs) {
     156        webkitResolveLocalFileSystemURL(fs.root.toURL(), function(entry) {
    157157            assertPathsMatch("/", entry.fullPath);
    158158            assertIsDirectory(entry);
    … …  
    198198}
    199199
    200 if (this.requestFileSystem) {
     200if (this.webkitRequestFileSystem) {
    201201    jsTestIsAsync = true;
    202     requestFileSystem(this.TEMPORARY, 100, fileSystemCallback, errorCallback);
     202    webkitRequestFileSystem(this.TEMPORARY, 100, fileSystemCallback, errorCallback);
    203203} else
    204204    debug("This test requires FileSystem API support.");

  • trunk/LayoutTests/http/tests/filesystem/workers/resolve-url-expected.txt

    r81848 r84224  
    1 [Worker] Tests using resolveLocalFileSystemURL to obtain an Entry from a URL
     1[Worker] Tests using webkitResolveLocalFileSystemURL to obtain an Entry from a URL
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

  • trunk/LayoutTests/http/tests/filesystem/workers/script-tests/resolve-url-sync.js

    r81848 r84224  
    44}
    55
    6 description("Tests using resolveLocalFileSystemSyncURL to obtain an Entry from a URL");
     6description("Tests using webkitResolveLocalFileSystemSyncURL to obtain an Entry from a URL");
    77
    88var testFileName = '/testFile';
    … …  
    5050    debug("* Resolving a generated URL.");
    5151    entry = createTestFile();
    52     var e = resolveLocalFileSystemSyncURL(entry.toURL());
     52    var e = webkitResolveLocalFileSystemSyncURL(entry.toURL());
    5353    assertPathsMatch(entry.fullPath, e.fullPath);
    5454    assertIsFile(e);
    … …  
    5858    debug("* Resolving test file by hand");
    5959    entry = createTestFile();
    60     var e = resolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporary/testFile");
     60    var e = webkitResolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporary/testFile");
    6161    assertPathsMatch(testFileName, e.fullPath);
    6262    assertIsFile(e);
    … …  
    6666    debug("* Resolving a URL with the wrong security origin (domain)");
    6767    try {
    68         resolveLocalFileSystemSyncURL("filesystem:http://localhost:8000/temporary/foo");
     68        webkitResolveLocalFileSystemSyncURL("filesystem:http://localhost:8000/temporary/foo");
    6969        testFailed();
    7070    } catch (e) {
    … …  
    7676    debug("* Resolving a URL with the wrong security origin (port)");
    7777    try {
    78         resolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8080/temporary/foo");
     78        webkitResolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8080/temporary/foo");
    7979        testFailed();
    8080    } catch (e) {
    … …  
    8686    debug("* Resolving a URL with the wrong security origin (scheme)");
    8787    try {
    88         resolveLocalFileSystemSyncURL("filesystem:https://127.0.0.1:8000/temporary/foo");
     88        webkitResolveLocalFileSystemSyncURL("filesystem:https://127.0.0.1:8000/temporary/foo");
    8989        testFailed();
    9090    } catch (e) {
    … …  
    9696    debug("* Resolving a completely bogus URL.");
    9797    try {
    98         resolveLocalFileSystemSyncURL("foo");
     98        webkitResolveLocalFileSystemSyncURL("foo");
    9999        testFailed();
    100100    } catch (e) {
    … …  
    106106    debug("* Resolving a URL with the wrong protocol");
    107107    try {
    108         resolveLocalFileSystemSyncURL("http://127.0.0.1:8000/foo/bar/baz");
     108        webkitResolveLocalFileSystemSyncURL("http://127.0.0.1:8000/foo/bar/baz");
    109109        testFailed();
    110110    } catch (e) {
    … …  
    117117    entry = createTestFile();
    118118    try {
    119         resolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporarytestFile");
     119        webkitResolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporarytestFile");
    120120        testFailed();
    121121    } catch (e) {
    … …  
    128128    entry = createTestFile();
    129129    try {
    130         resolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000temporary/testFile");
     130        webkitResolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000temporary/testFile");
    131131    } catch (e) {
    132132        assertSecurityErr(e.code);
    … …  
    137137    debug("* Resolve a path using backslashes");
    138138    entry = fileSystem.root.getDirectory("foo", {create:true}).getFile("testFile", {create:true});
    139     var e = resolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporary/foo\\testFile");
     139    var e = webkitResolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporary/foo\\testFile");
    140140    assertPathsMatch("/foo/testFile", e.fullPath);
    141141    assertIsFile(e);
    … …  
    145145    debug("* Resolve a directory");
    146146    entry = fileSystem.root.getDirectory("foo", {create:true});
    147     var e = resolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporary/foo");
     147    var e = webkitResolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporary/foo");
    148148    assertPathsMatch("/foo", e.fullPath);
    149149    assertIsDirectory(e);
    … …  
    153153    debug("* Resolve a path using a trailing slash");
    154154    entry = fileSystem.root.getDirectory("foo", {create:true});
    155     var e = resolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporary/foo/");
     155    var e = webkitResolveLocalFileSystemSyncURL("filesystem:http://127.0.0.1:8000/temporary/foo/");
    156156    assertPathsMatch("/foo", e.fullPath);
    157157    assertIsDirectory(e);
    … …  
    160160function runPersistentTest() {
    161161    debug("* Resolving a persistent URL.");
    162     var fs = requestFileSystemSync(PERSISTENT, 100);
    163     entry = resolveLocalFileSystemSyncURL(fs.root.toURL());
     162    var fs = webkitRequestFileSystemSync(PERSISTENT, 100);
     163    entry = webkitResolveLocalFileSystemSyncURL(fs.root.toURL());
    164164    assertPathsMatch("/", entry.fullPath);
    165165    assertIsDirectory(entry);
    … …  
    185185var testCounter = 0;
    186186
    187 if (this.requestFileSystem) {
    188     fileSystem = requestFileSystemSync(this.TEMPORARY, 100);
     187if (this.webkitRequestFileSystem) {
     188    fileSystem = webkitRequestFileSystemSync(this.TEMPORARY, 100);
    189189    for (var i = 0; i < testsList.length; ++i) {
    190190      testsList[i]();

  • trunk/LayoutTests/platform/chromium/fast/dom/prototype-inheritance-expected.txt

    r83884 r84224  
    762762PASS inner.resizeTo.isInner is true
    763763PASS inner.resizeTo.constructor.isInner is true
    764 PASS inner.resolveLocalFileSystemURL.isInner is true
    765 PASS inner.resolveLocalFileSystemURL.constructor.isInner is true
    766764FAIL inner.screen.isInner should be true. Was false.
    767765FAIL inner.screen.constructor.isInner should be true. Was false.
    … …  
    822820PASS inner.webkitRequestAnimationFrame.isInner is true
    823821PASS inner.webkitRequestAnimationFrame.constructor.isInner is true
     822PASS inner.webkitRequestFileSystem.isInner is true
     823PASS inner.webkitRequestFileSystem.constructor.isInner is true
     824PASS inner.webkitResolveLocalFileSystemURL.isInner is true
     825PASS inner.webkitResolveLocalFileSystemURL.constructor.isInner is true
    824826PASS inner.window.isInner is true
    825827PASS inner.window.constructor.isInner is true

  • trunk/Source/WebCore/CMakeLists.txt

    r84222 r84224  
    15511551        fileapi/FileWriter.idl
    15521552        fileapi/FileWriterSync.idl
    1553         fileapi/Flags.idl
     1553        fileapi/WebKitFlags.idl
    15541554        fileapi/Metadata.idl
    15551555        fileapi/MetadataCallback.idl

  • trunk/Source/WebCore/ChangeLog

    r84222 r84224  
     12011-04-18  Taiju TSUIKI  <develop@tzik.jp>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Vendor-prefix requestFileSystem in FileSystem API
     6        https://bugs.webkit.org/show_bug.cgi?id=58517
     7
     8        Prefix from:
     9        - window.requestFileSystem to window.webkitRequestFileSystem
     10        - window.resolveLocalFileSystemURL to window.webkitResolveLocalFileSystemURL
     11        - window.Flags to window.WebKitFlags
     12        - WorkerContext.requestFileSystem to WorkerContext.webkitRequestFileSystem
     13        - WorkerContext.resolveLocalFileSystemURL to WorkerContext.webkitResolveLocalFileSystemURL
     14        - WorkerContext.Flags to WorkerContext.WebKitFlags
     15
     16        * CMakeLists.txt:
     17        * CodeGenerators.pri:
     18        * DerivedSources.cpp:
     19        * DerivedSources.make:
     20        * GNUmakefile.list.am:
     21        * WebCore.gypi:
     22        * WebCore.pro:
     23        * WebCore.vcproj/WebCore.vcproj:
     24        * WebCore.xcodeproj/project.pbxproj:
     25        * bindings/js/JSDirectoryEntryCustom.cpp:
     26        (WebCore::JSDirectoryEntry::getFile):
     27        (WebCore::JSDirectoryEntry::getDirectory):
     28        * bindings/js/JSDirectoryEntrySyncCustom.cpp:
     29        (WebCore::getFlags):
     30        (WebCore::JSDirectoryEntrySync::getFile):
     31        (WebCore::JSDirectoryEntrySync::getDirectory):
     32        * bindings/v8/custom/V8DirectoryEntryCustom.cpp:
     33        (WebCore::V8DirectoryEntry::getDirectoryCallback):
     34        (WebCore::V8DirectoryEntry::getFileCallback):
     35        * bindings/v8/custom/V8DirectoryEntrySyncCustom.cpp:
     36        (WebCore::getFlags):
     37        (WebCore::V8DirectoryEntrySync::getDirectoryCallback):
     38        (WebCore::V8DirectoryEntrySync::getFileCallback):
     39        * fileapi/DOMFileSystemBase.cpp:
     40        (WebCore::DOMFileSystemBase::getFile):
     41        (WebCore::DOMFileSystemBase::getDirectory):
     42        * fileapi/DOMFileSystemBase.h:
     43        * fileapi/DirectoryEntry.cpp:
     44        (WebCore::DirectoryEntry::getFile):
     45        (WebCore::DirectoryEntry::getDirectory):
     46        * fileapi/DirectoryEntry.h:
     47        * fileapi/DirectoryEntry.idl:
     48        * fileapi/DirectoryEntrySync.cpp:
     49        (WebCore::DirectoryEntrySync::getFile):
     50        (WebCore::DirectoryEntrySync::getDirectory):
     51        * fileapi/DirectoryEntrySync.h:
     52        * fileapi/DirectoryEntrySync.idl:
     53        * fileapi/WebKitFlags.h: Renamed from Source/WebCore/fileapi/Flags.h.
     54        (WebCore::WebKitFlags::create):
     55        (WebCore::WebKitFlags::isCreate):
     56        (WebCore::WebKitFlags::setCreate):
     57        (WebCore::WebKitFlags::isExclusive):
     58        (WebCore::WebKitFlags::setExclusive):
     59        (WebCore::WebKitFlags::WebKitFlags):
     60        * fileapi/WebKitFlags.idl: Renamed from Source/WebCore/fileapi/Flags.idl.
     61        * page/DOMWindow.cpp:
     62        (WebCore::DOMWindow::webkitRequestFileSystem):
     63        (WebCore::DOMWindow::webkitResolveLocalFileSystemURL):
     64        * page/DOMWindow.h:
     65        * page/DOMWindow.idl:
     66        * workers/WorkerContext.cpp:
     67        (WebCore::WorkerContext::webkitRequestFileSystem):
     68        (WebCore::WorkerContext::webkitRequestFileSystemSync):
     69        (WebCore::WorkerContext::webkitResolveLocalFileSystemURL):
     70        (WebCore::WorkerContext::webkitResolveLocalFileSystemSyncURL):
     71        * workers/WorkerContext.h:
     72        * workers/WorkerContext.idl:
     73
    1742011-04-18  Steve Lacey  <sjl@chromium.org>
    275

  • trunk/Source/WebCore/CodeGenerators.pri

    r84053 r84224  
    185185    fileapi/FileWriter.idl \
    186186    fileapi/FileWriterCallback.idl \
    187     fileapi/Flags.idl \
     187    fileapi/WebKitFlags.idl \
    188188    fileapi/Metadata.idl \
    189189    fileapi/MetadataCallback.idl \

  • trunk/Source/WebCore/DerivedSources.cpp

    r84053 r84224  
    129129#include "JSFileWriterCallback.cpp"
    130130#include "JSFileWriterSync.cpp"
    131 #include "JSFlags.cpp"
     131#include "JSWebKitFlags.cpp"
    132132#include "JSFloat32Array.cpp"
    133133#include "JSGeolocation.cpp"

  • trunk/Source/WebCore/DerivedSources.make

    r84053 r84224  
    198198    FileWriterSync \
    199199    FileSystemCallback \
    200     Flags \
     200    WebKitFlags \
    201201    Geolocation \
    202202    Geoposition \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r84222 r84224  
    14831483        Source/WebCore/fileapi/FileWriterSync.cpp \
    14841484        Source/WebCore/fileapi/FileWriterSync.h \
    1485         Source/WebCore/fileapi/Flags.h \
     1485        Source/WebCore/fileapi/WebKitFlags.h \
    14861486        Source/WebCore/fileapi/LocalFileSystem.cpp \
    14871487        Source/WebCore/fileapi/LocalFileSystem.h \
    … …  
    40594059        DerivedSources/WebCore/JSFileWriterSync.cpp \
    40604060        DerivedSources/WebCore/JSFileWriterSync.h \
    4061         DerivedSources/WebCore/JSFlags.cpp \
    4062         DerivedSources/WebCore/JSFlags.h \
     4061        DerivedSources/WebCore/JSWebKitFlags.cpp \
     4062        DerivedSources/WebCore/JSWebKitFlags.h \
    40634063        DerivedSources/WebCore/JSMetadata.cpp \
    40644064        DerivedSources/WebCore/JSMetadata.h \

  • trunk/Source/WebCore/WebCore.gypi

    r84222 r84224  
    11891189            'fileapi/FileWriterCallback.idl',
    11901190            'fileapi/FileWriterSync.idl',
    1191             'fileapi/Flags.idl',
     1191            'fileapi/WebKitFlags.idl',
    11921192            'fileapi/Metadata.idl',
    11931193            'fileapi/MetadataCallback.idl',
    … …  
    27672767            'fileapi/FileWriterSync.cpp',
    27682768            'fileapi/FileWriterSync.h',
    2769             'fileapi/Flags.h',
     2769            'fileapi/WebKitFlags.h',
    27702770            'fileapi/LocalFileSystem.cpp',
    27712771            'fileapi/LocalFileSystem.h',
    … …  
    71997199            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSFileWriterSync.cpp',
    72007200            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSFileWriterSync.h',
    7201             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSFlags.cpp',
    7202             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSFlags.h',
     7201            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitFlags.cpp',
     7202            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitFlags.h',
    72037203            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSFloat32Array.cpp',
    72047204            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSFloat32Array.h',

  • trunk/Source/WebCore/WebCore.pro

    r84222 r84224  
    28602860        fileapi/FileWriterClient.h \
    28612861        fileapi/FileWriterSync.h \
    2862         fileapi/Flags.h \
     2862        fileapi/WebKitFlags.h \
    28632863        fileapi/LocalFileSystem.h \
    28642864        fileapi/Metadata.h \

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

    r84222 r84224  
    54315431                        </File>
    54325432                        <File
    5433                                 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSFlags.cpp"
    5434                                 >
    5435                                 <FileConfiguration
    5436                                         Name="Debug|Win32"
    5437                                         ExcludedFromBuild="true"
    5438                                         >
    5439                                         <Tool
    5440                                                 Name="VCCLCompilerTool"
    5441                                         />
    5442                                 </FileConfiguration>
    5443                                 <FileConfiguration
    5444                                         Name="Release|Win32"
    5445                                         ExcludedFromBuild="true"
    5446                                         >
    5447                                         <Tool
    5448                                                 Name="VCCLCompilerTool"
    5449                                         />
    5450                                 </FileConfiguration>
    5451                                 <FileConfiguration
    5452                                         Name="Debug_Cairo_CFLite|Win32"
    5453                                         ExcludedFromBuild="true"
    5454                                         >
    5455                                         <Tool
    5456                                                 Name="VCCLCompilerTool"
    5457                                         />
    5458                                 </FileConfiguration>
    5459                                 <FileConfiguration
    5460                                         Name="Release_Cairo_CFLite|Win32"
    5461                                         ExcludedFromBuild="true"
    5462                                         >
    5463                                         <Tool
    5464                                                 Name="VCCLCompilerTool"
    5465                                         />
    5466                                 </FileConfiguration>
    5467                                 <FileConfiguration
    5468                                         Name="Debug_All|Win32"
    5469                                         ExcludedFromBuild="true"
    5470                                         >
    5471                                         <Tool
    5472                                                 Name="VCCLCompilerTool"
    5473                                         />
    5474                                 </FileConfiguration>
    5475                                 <FileConfiguration
    5476                                         Name="Production|Win32"
    5477                                         ExcludedFromBuild="true"
    5478                                         >
    5479                                         <Tool
    5480                                                 Name="VCCLCompilerTool"
    5481                                         />
    5482                                 </FileConfiguration>
    5483                         </File>
    5484                         <File
    5485                                 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSFlags.h"
     5433                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitFlags.cpp"
     5434                                >
     5435                                <FileConfiguration
     5436                                        Name="Debug|Win32"
     5437                                        ExcludedFromBuild="true"
     5438                                        >
     5439                                        <Tool
     5440                                                Name="VCCLCompilerTool"
     5441                                        />
     5442                                </FileConfiguration>
     5443                                <FileConfiguration
     5444                                        Name="Release|Win32"
     5445                                        ExcludedFromBuild="true"
     5446                                        >
     5447                                        <Tool
     5448                                                Name="VCCLCompilerTool"
     5449                                        />
     5450                                </FileConfiguration>
     5451                                <FileConfiguration
     5452                                        Name="Debug_Cairo_CFLite|Win32"
     5453                                        ExcludedFromBuild="true"
     5454                                        >
     5455                                        <Tool
     5456                                                Name="VCCLCompilerTool"
     5457                                        />
     5458                                </FileConfiguration>
     5459                                <FileConfiguration
     5460                                        Name="Release_Cairo_CFLite|Win32"
     5461                                        ExcludedFromBuild="true"
     5462                                        >
     5463                                        <Tool
     5464                                                Name="VCCLCompilerTool"
     5465                                        />
     5466                                </FileConfiguration>
     5467                                <FileConfiguration
     5468                                        Name="Debug_All|Win32"
     5469                                        ExcludedFromBuild="true"
     5470                                        >
     5471                                        <Tool
     5472                                                Name="VCCLCompilerTool"
     5473                                        />
     5474                                </FileConfiguration>
     5475                                <FileConfiguration
     5476                                        Name="Production|Win32"
     5477                                        ExcludedFromBuild="true"
     5478                                        >
     5479                                        <Tool
     5480                                                Name="VCCLCompilerTool"
     5481                                        />
     5482                                </FileConfiguration>
     5483                        </File>
     5484                        <File
     5485                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitFlags.h"
    54865486                                >
    54875487                        </File>
    … …  
    5172351723                        </File>
    5172451724                        <File
    51725                                 RelativePath="..\fileapi\Flags.h"
     51725                                RelativePath="..\fileapi\WebKitFlags.h"
    5172651726                                >
    5172751727                        </File>

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

    r84222 r84224  
    27292729                89878564122CA064003AABDA /* FileSystemCallbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8987854B122CA064003AABDA /* FileSystemCallbacks.cpp */; };
    27302730                89878565122CA064003AABDA /* FileSystemCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 8987854C122CA064003AABDA /* FileSystemCallbacks.h */; };
    2731                 89878566122CA064003AABDA /* Flags.h in Headers */ = {isa = PBXBuildFile; fileRef = 8987854D122CA064003AABDA /* Flags.h */; };
     2731                89878566122CA064003AABDA /* WebKitFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 8987854D122CA064003AABDA /* WebKitFlags.h */; };
    27322732                89878567122CA064003AABDA /* LocalFileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8987854E122CA064003AABDA /* LocalFileSystem.cpp */; };
    27332733                89878568122CA064003AABDA /* LocalFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 8987854F122CA064003AABDA /* LocalFileSystem.h */; };
    … …  
    27542754                898785B2122CA2A7003AABDA /* JSFileSystemCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8987859C122CA2A7003AABDA /* JSFileSystemCallback.cpp */; };
    27552755                898785B3122CA2A7003AABDA /* JSFileSystemCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 8987859D122CA2A7003AABDA /* JSFileSystemCallback.h */; };
    2756                 898785B4122CA2A7003AABDA /* JSFlags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8987859E122CA2A7003AABDA /* JSFlags.cpp */; };
    2757                 898785B5122CA2A7003AABDA /* JSFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 8987859F122CA2A7003AABDA /* JSFlags.h */; };
     2756                898785B4122CA2A7003AABDA /* JSWebKitFlags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8987859E122CA2A7003AABDA /* JSWebKitFlags.cpp */; };
     2757                898785B5122CA2A7003AABDA /* JSWebKitFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 8987859F122CA2A7003AABDA /* JSWebKitFlags.h */; };
    27582758                898785B6122CA2A7003AABDA /* JSMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 898785A0122CA2A7003AABDA /* JSMetadata.cpp */; };
    27592759                898785B7122CA2A7003AABDA /* JSMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 898785A1122CA2A7003AABDA /* JSMetadata.h */; };
    … …  
    92939293                8987854B122CA064003AABDA /* FileSystemCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileSystemCallbacks.cpp; path = fileapi/FileSystemCallbacks.cpp; sourceTree = "<group>"; };
    92949294                8987854C122CA064003AABDA /* FileSystemCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileSystemCallbacks.h; path = fileapi/FileSystemCallbacks.h; sourceTree = "<group>"; };
    9295                 8987854D122CA064003AABDA /* Flags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Flags.h; path = fileapi/Flags.h; sourceTree = "<group>"; };
     9295                8987854D122CA064003AABDA /* WebKitFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebKitFlags.h; path = fileapi/WebKitFlags.h; sourceTree = "<group>"; };
    92969296                8987854E122CA064003AABDA /* LocalFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LocalFileSystem.cpp; path = fileapi/LocalFileSystem.cpp; sourceTree = "<group>"; };
    92979297                8987854F122CA064003AABDA /* LocalFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LocalFileSystem.h; path = fileapi/LocalFileSystem.h; sourceTree = "<group>"; };
    … …  
    93189318                8987859C122CA2A7003AABDA /* JSFileSystemCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileSystemCallback.cpp; sourceTree = "<group>"; };
    93199319                8987859D122CA2A7003AABDA /* JSFileSystemCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFileSystemCallback.h; sourceTree = "<group>"; };
    9320                 8987859E122CA2A7003AABDA /* JSFlags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFlags.cpp; sourceTree = "<group>"; };
    9321                 8987859F122CA2A7003AABDA /* JSFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFlags.h; sourceTree = "<group>"; };
     9320                8987859E122CA2A7003AABDA /* JSWebKitFlags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitFlags.cpp; sourceTree = "<group>"; };
     9321                8987859F122CA2A7003AABDA /* JSWebKitFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitFlags.h; sourceTree = "<group>"; };
    93229322                898785A0122CA2A7003AABDA /* JSMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMetadata.cpp; sourceTree = "<group>"; };
    93239323                898785A1122CA2A7003AABDA /* JSMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMetadata.h; sourceTree = "<group>"; };
    … …  
    1562015620                                893C47B91238A0A9002B3D86 /* JSFileWriterCallback.cpp */,
    1562115621                                893C47BA1238A0A9002B3D86 /* JSFileWriterCallback.h */,
    15622                                 8987859E122CA2A7003AABDA /* JSFlags.cpp */,
    15623                                 8987859F122CA2A7003AABDA /* JSFlags.h */,
     15622                                8987859E122CA2A7003AABDA /* JSWebKitFlags.cpp */,
     15623                                8987859F122CA2A7003AABDA /* JSWebKitFlags.h */,
    1562415624                                898785A0122CA2A7003AABDA /* JSMetadata.cpp */,
    1562515625                                898785A1122CA2A7003AABDA /* JSMetadata.h */,
    … …  
    1627716277                                46700ECE127B96CB00F5D5D6 /* FileWriterSync.cpp */,
    1627816278                                46700ECF127B96CB00F5D5D6 /* FileWriterSync.h */,
    16279                                 8987854D122CA064003AABDA /* Flags.h */,
     16279                                8987854D122CA064003AABDA /* WebKitFlags.h */,
    1628016280                                8987854E122CA064003AABDA /* LocalFileSystem.cpp */,
    1628116281                                8987854F122CA064003AABDA /* LocalFileSystem.h */,
    … …  
    2111621116                                372C00D9129619F8005C9575 /* FindOptions.h in Headers */,
    2111721117                                A8CFF04F0A154F09000A4234 /* FixedTableLayout.h in Headers */,
    21118                                 89878566122CA064003AABDA /* Flags.h in Headers */,
     21118                                89878566122CA064003AABDA /* WebKitFlags.h in Headers */,
    2111921119                                49EECDE610503C2400099FAB /* Float32Array.h in Headers */,
    2112021120                                BC073BAA0C399B1F000F5979 /* FloatConversion.h in Headers */,
    … …  
    2158321583                                46DA844E1224A0710060D006 /* JSFileWriter.h in Headers */,
    2158421584                                893C47BC1238A0A9002B3D86 /* JSFileWriterCallback.h in Headers */,
    21585                                 898785B5122CA2A7003AABDA /* JSFlags.h in Headers */,
     21585                                898785B5122CA2A7003AABDA /* JSWebKitFlags.h in Headers */,
    2158621586                                49EECF03105070C400099FAB /* JSFloat32Array.h in Headers */,
    2158721587                                FE80DA640E9C4703000D6F75 /* JSGeolocation.h in Headers */,
    … …  
    2444524445                                46DA844D1224A0710060D006 /* JSFileWriter.cpp in Sources */,
    2444624446                                893C47BB1238A0A9002B3D86 /* JSFileWriterCallback.cpp in Sources */,
    24447                                 898785B4122CA2A7003AABDA /* JSFlags.cpp in Sources */,
     24447                                898785B4122CA2A7003AABDA /* JSWebKitFlags.cpp in Sources */,
    2444824448                                49EECF02105070C400099FAB /* JSFloat32Array.cpp in Sources */,
    2444924449                                49EECF7910508D9C00099FAB /* JSFloat32ArrayCustom.cpp in Sources */,

  • trunk/Source/WebCore/bindings/js/JSDirectoryEntryCustom.cpp

    r75879 r84224  
    3939#include "JSEntryCallback.h"
    4040#include "JSErrorCallback.h"
    41 #include "JSFlags.h"
     41#include "JSWebKitFlags.h"
    4242#include <wtf/Assertions.h>
    4343
    … …  
    5959    }
    6060
    61     RefPtr<Flags> flags;
    62     if (!exec->argument(1).isNull() && !exec->argument(1).isUndefined() && exec->argument(1).isObject() && !exec->argument(1).inherits(&JSFlags::s_info)) {
     61    RefPtr<WebKitFlags> flags;
     62    if (!exec->argument(1).isNull() && !exec->argument(1).isUndefined() && exec->argument(1).isObject() && !exec->argument(1).inherits(&JSWebKitFlags::s_info)) {
    6363        JSObject* object = exec->argument(1).getObject();
    64         flags = Flags::create();
     64        flags = WebKitFlags::create();
    6565        JSValue jsCreate = object->get(exec, Identifier(exec, "create"));
    6666        flags->setCreate(jsCreate.toBoolean(exec));
    … …  
    6868        flags->setExclusive(jsExclusive.toBoolean(exec));
    6969    } else
    70         flags = toFlags(exec->argument(1));
     70        flags = toWebKitFlags(exec->argument(1));
    7171    if (exec->hadException())
    7272        return jsUndefined();
    … …  
    105105    }
    106106
    107     RefPtr<Flags> flags;
    108     if (!exec->argument(1).isNull() && !exec->argument(1).isUndefined() && exec->argument(1).isObject() && !exec->argument(1).inherits(&JSFlags::s_info)) {
     107    RefPtr<WebKitFlags> flags;
     108    if (!exec->argument(1).isNull() && !exec->argument(1).isUndefined() && exec->argument(1).isObject() && !exec->argument(1).inherits(&JSWebKitFlags::s_info)) {
    109109        JSObject* object = exec->argument(1).getObject();
    110         flags = Flags::create();
     110        flags = WebKitFlags::create();
    111111        JSValue jsCreate = object->get(exec, Identifier(exec, "create"));
    112112        flags->setCreate(jsCreate.toBoolean(exec));
    … …  
    114114        flags->setExclusive(jsExclusive.toBoolean(exec));
    115115    } else
    116         flags = toFlags(exec->argument(1));
     116        flags = toWebKitFlags(exec->argument(1));
    117117    if (exec->hadException())
    118118        return jsUndefined();

  • trunk/Source/WebCore/bindings/js/JSDirectoryEntrySyncCustom.cpp

    r69178 r84224  
    3939#include "JSErrorCallback.h"
    4040#include "JSFileEntrySync.h"
    41 #include "JSFlags.h"
     41#include "JSWebKitFlags.h"
    4242#include <wtf/Assertions.h>
    4343
    … …  
    4646namespace WebCore {
    4747
    48 static PassRefPtr<Flags> getFlags(ExecState* exec, const JSValue& argument)
     48static PassRefPtr<WebKitFlags> getFlags(ExecState* exec, const JSValue& argument)
    4949{
    5050    if (argument.isNull() || argument.isUndefined() || !argument.isObject())
    5151        return 0;
    52     if (argument.inherits(&JSFlags::s_info))
     52    if (argument.inherits(&JSWebKitFlags::s_info))
    5353        return toFlags(argument);
    5454
    55     RefPtr<Flags> flags;
     55    RefPtr<WebKitFlags> flags;
    5656    JSObject* object = argument.getObject();
    57     flags = Flags::create();
     57    flags = WebKitFlags::create();
    5858    JSValue jsCreate = object->get(exec, Identifier(exec, "create"));
    5959    flags->setCreate(jsCreate.toBoolean(exec));
    … …  
    7070        return jsUndefined();
    7171
    72     RefPtr<Flags> flags = getFlags(exec, exec->argument(1));
     72    RefPtr<WebKitFlags> flags = getFlags(exec, exec->argument(1));
    7373    if (exec->hadException())
    7474        return jsUndefined();
    … …  
    8787        return jsUndefined();
    8888
    89     RefPtr<Flags> flags = getFlags(exec, exec->argument(1));
     89    RefPtr<WebKitFlags> flags = getFlags(exec, exec->argument(1));
    9090    if (exec->hadException())
    9191        return jsUndefined();

  • trunk/Source/WebCore/bindings/v8/custom/V8DirectoryEntryCustom.cpp

    r68735 r84224  
    4040#include "V8EntryCallback.h"
    4141#include "V8ErrorCallback.h"
    42 #include "V8Flags.h"
     42#include "V8WebKitFlags.h"
    4343#include "V8Proxy.h"
    4444#include <wtf/RefCounted.h>
    … …  
    5656        return v8::Handle<v8::Value>();
    5757    }
    58     RefPtr<Flags> flags;
    59     if (!isUndefinedOrNull(args[1]) && args[1]->IsObject() && !V8Flags::HasInstance(args[1])) {
     58    RefPtr<WebKitFlags> flags;
     59    if (!isUndefinedOrNull(args[1]) && args[1]->IsObject() && !V8WebKitFlags::HasInstance(args[1])) {
    6060        EXCEPTION_BLOCK(v8::Handle<v8::Object>, object, v8::Handle<v8::Object>::Cast(args[1]));
    61         flags = Flags::create();
     61        flags = WebKitFlags::create();
    6262        v8::Local<v8::Value> v8Create = object->Get(v8::String::New("create"));
    6363        if (!v8Create.IsEmpty() && !isUndefinedOrNull(v8Create)) {
    … …  
    7171        }
    7272    } else {
    73         EXCEPTION_BLOCK(Flags*, tmp_flags, V8Flags::HasInstance(args[1]) ? V8Flags::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
     73        EXCEPTION_BLOCK(WebKitFlags*, tmp_flags, V8WebKitFlags::HasInstance(args[1]) ? V8WebKitFlags::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
    7474        flags = tmp_flags;
    7575    }
    … …  
    9999        return v8::Handle<v8::Value>();
    100100    }
    101     RefPtr<Flags> flags;
    102     if (!isUndefinedOrNull(args[1]) && args[1]->IsObject() && !V8Flags::HasInstance(args[1])) {
     101    RefPtr<WebKitFlags> flags;
     102    if (!isUndefinedOrNull(args[1]) && args[1]->IsObject() && !V8WebKitFlags::HasInstance(args[1])) {
    103103        EXCEPTION_BLOCK(v8::Handle<v8::Object>, object, v8::Handle<v8::Object>::Cast(args[1]));
    104         flags = Flags::create();
     104        flags = WebKitFlags::create();
    105105        v8::Local<v8::Value> v8Create = object->Get(v8::String::New("create"));
    106106        if (!v8Create.IsEmpty() && !isUndefinedOrNull(v8Create)) {
    … …  
    114114        }
    115115    } else {
    116        EXCEPTION_BLOCK(Flags*, tmp_flags, V8Flags::HasInstance(args[1]) ? V8Flags::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
     116       EXCEPTION_BLOCK(WebKitFlags*, tmp_flags, V8WebKitFlags::HasInstance(args[1]) ? V8WebKitFlags::toNative(v8::Handle<v8::Object>::Cast(args[1])) : 0);
    117117       flags = tmp_flags;
    118118    }

  • trunk/Source/WebCore/bindings/v8/custom/V8DirectoryEntrySyncCustom.cpp

    r69178 r84224  
    4141#include "V8ErrorCallback.h"
    4242#include "V8FileEntrySync.h"
    43 #include "V8Flags.h"
     43#include "V8WebKitFlags.h"
    4444#include "V8Proxy.h"
    4545#include <wtf/RefCounted.h>
    … …  
    6363}
    6464
    65 static PassRefPtr<Flags> getFlags(const v8::Local<v8::Value>& arg, ExceptionCode& ec)
     65static PassRefPtr<WebKitFlags> getFlags(const v8::Local<v8::Value>& arg, ExceptionCode& ec)
    6666{
    6767    ec = 0;
    6868    if (isUndefinedOrNull(arg) || !arg->IsObject())
    6969        return 0;
    70     if (V8Flags::HasInstance(arg))
    71         return V8Flags::toNative(v8::Handle<v8::Object>::Cast(arg));
     70    if (V8WebKitFlags::HasInstance(arg))
     71        return V8WebKitFlags::toNative(v8::Handle<v8::Object>::Cast(arg));
    7272
    7373    v8::Handle<v8::Object> object;
    … …  
    8888        return 0;
    8989
    90     RefPtr<Flags> flags = Flags::create();
     90    RefPtr<WebKitFlags> flags = WebKitFlags::create();
    9191    flags->setCreate(isCreate);
    9292    flags->setExclusive(isExclusive);
    … …  
    101101    ExceptionCode ec = 0;
    102102    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, path, args[0]);
    103     RefPtr<Flags> flags = getFlags(args[1], ec);
     103    RefPtr<WebKitFlags> flags = getFlags(args[1], ec);
    104104    if (UNLIKELY(ec)) {
    105105        V8Proxy::setDOMException(ec);
    … …  
    120120    ExceptionCode ec = 0;
    121121    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, path, args[0]);
    122     RefPtr<Flags> flags = getFlags(args[1], ec);
     122    RefPtr<WebKitFlags> flags = getFlags(args[1], ec);
    123123    if (UNLIKELY(ec)) {
    124124        V8Proxy::setDOMException(ec);

  • trunk/Source/WebCore/fileapi/DOMFileSystemBase.cpp

    r83972 r84224  
    206206}
    207207
    208 bool DOMFileSystemBase::getFile(const EntryBase* base, const String& path, PassRefPtr<Flags> flags, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
     208bool DOMFileSystemBase::getFile(const EntryBase* base, const String& path, PassRefPtr<WebKitFlags> flags, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
    209209{
    210210    String absolutePath;
    … …  
    221221}
    222222
    223 bool DOMFileSystemBase::getDirectory(const EntryBase* base, const String& path, PassRefPtr<Flags> flags, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
     223bool DOMFileSystemBase::getDirectory(const EntryBase* base, const String& path, PassRefPtr<WebKitFlags> flags, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
    224224{
    225225    String absolutePath;

  • trunk/Source/WebCore/fileapi/DOMFileSystemBase.h

    r83972 r84224  
    3535
    3636#include "AsyncFileSystem.h"
    37 #include "Flags.h"
     37#include "WebKitFlags.h"
    3838#include "PlatformString.h"
    3939#include <wtf/PassRefPtr.h>
    … …  
    8383    bool removeRecursively(const EntryBase*, PassRefPtr<VoidCallback>, PassRefPtr<ErrorCallback>);
    8484    bool getParent(const EntryBase*, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
    85     bool getFile(const EntryBase*, const String& path, PassRefPtr<Flags>, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
    86     bool getDirectory(const EntryBase*, const String& path, PassRefPtr<Flags>, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
     85    bool getFile(const EntryBase*, const String& path, PassRefPtr<WebKitFlags>, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
     86    bool getDirectory(const EntryBase*, const String& path, PassRefPtr<WebKitFlags>, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
    8787    bool readDirectory(PassRefPtr<DirectoryReaderBase>, const String& path, PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>);
    8888

  • trunk/Source/WebCore/fileapi/DirectoryEntry.cpp

    r70741 r84224  
    5252}
    5353
    54 void DirectoryEntry::getFile(const String& path, PassRefPtr<Flags> flags, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallbackRef)
     54void DirectoryEntry::getFile(const String& path, PassRefPtr<WebKitFlags> flags, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallbackRef)
    5555{
    5656    RefPtr<ErrorCallback> errorCallback(errorCallbackRef);
    … …  
    5959}
    6060
    61 void DirectoryEntry::getDirectory(const String& path, PassRefPtr<Flags> flags, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallbackRef)
     61void DirectoryEntry::getDirectory(const String& path, PassRefPtr<WebKitFlags> flags, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallbackRef)
    6262{
    6363    RefPtr<ErrorCallback> errorCallback(errorCallbackRef);

  • trunk/Source/WebCore/fileapi/DirectoryEntry.h

    r70741 r84224  
    3535
    3636#include "Entry.h"
    37 #include "Flags.h"
     37#include "WebKitFlags.h"
    3838#include "PlatformString.h"
    3939#include <wtf/PassRefPtr.h>
    … …  
    5757
    5858    PassRefPtr<DirectoryReader> createReader();
    59     void getFile(const String& path, PassRefPtr<Flags> = 0, PassRefPtr<EntryCallback> = 0, PassRefPtr<ErrorCallback> = 0);
    60     void getDirectory(const String& path, PassRefPtr<Flags> = 0, PassRefPtr<EntryCallback> = 0, PassRefPtr<ErrorCallback> = 0);
     59    void getFile(const String& path, PassRefPtr<WebKitFlags> = 0, PassRefPtr<EntryCallback> = 0, PassRefPtr<ErrorCallback> = 0);
     60    void getDirectory(const String& path, PassRefPtr<WebKitFlags> = 0, PassRefPtr<EntryCallback> = 0, PassRefPtr<ErrorCallback> = 0);
    6161    void removeRecursively(PassRefPtr<VoidCallback> successCallback = 0, PassRefPtr<ErrorCallback> = 0) const;
    6262

  • trunk/Source/WebCore/fileapi/DirectoryEntry.idl

    r69485 r84224  
    3737    ] DirectoryEntry : Entry {
    3838        DirectoryReader createReader();
    39         [Custom] void getFile(in [ConvertUndefinedOrNullToNullString] DOMString path, in [Optional] Flags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    40         [Custom] void getDirectory(in [ConvertUndefinedOrNullToNullString] DOMString path, in [Optional] Flags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     39        [Custom] void getFile(in [ConvertUndefinedOrNullToNullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     40        [Custom] void getDirectory(in [ConvertUndefinedOrNullToNullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    4141        void removeRecursively(in [Optional, Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    4242    };

  • trunk/Source/WebCore/fileapi/DirectoryEntrySync.cpp

    r70741 r84224  
    5252}
    5353
    54 PassRefPtr<FileEntrySync> DirectoryEntrySync::getFile(const String& path, PassRefPtr<Flags> flags, ExceptionCode& ec)
     54PassRefPtr<FileEntrySync> DirectoryEntrySync::getFile(const String& path, PassRefPtr<WebKitFlags> flags, ExceptionCode& ec)
    5555{
    5656    ec = 0;
    … …  
    6363}
    6464
    65 PassRefPtr<DirectoryEntrySync> DirectoryEntrySync::getDirectory(const String& path, PassRefPtr<Flags> flags, ExceptionCode& ec)
     65PassRefPtr<DirectoryEntrySync> DirectoryEntrySync::getDirectory(const String& path, PassRefPtr<WebKitFlags> flags, ExceptionCode& ec)
    6666{
    6767    ec = 0;

  • trunk/Source/WebCore/fileapi/DirectoryEntrySync.h

    r70741 r84224  
    3535
    3636#include "EntrySync.h"
    37 #include "Flags.h"
     37#include "WebKitFlags.h"
    3838#include "PlatformString.h"
    3939#include <wtf/PassRefPtr.h>
    … …  
    5454
    5555    PassRefPtr<DirectoryReaderSync> createReader(ExceptionCode&);
    56     PassRefPtr<FileEntrySync> getFile(const String& path, PassRefPtr<Flags>, ExceptionCode&);
    57     PassRefPtr<DirectoryEntrySync> getDirectory(const String& path, PassRefPtr<Flags>, ExceptionCode&);
     56    PassRefPtr<FileEntrySync> getFile(const String& path, PassRefPtr<WebKitFlags>, ExceptionCode&);
     57    PassRefPtr<DirectoryEntrySync> getDirectory(const String& path, PassRefPtr<WebKitFlags>, ExceptionCode&);
    5858    void removeRecursively(ExceptionCode&);
    5959

  • trunk/Source/WebCore/fileapi/DirectoryEntrySync.idl

    r69485 r84224  
    3737    ] DirectoryEntrySync : EntrySync {
    3838        DirectoryReaderSync createReader() raises (FileException);
    39         [Custom] FileEntrySync getFile(in [ConvertUndefinedOrNullToNullString] DOMString path, in Flags flags) raises (FileException);
    40         [Custom] DirectoryEntrySync getDirectory(in [ConvertUndefinedOrNullToNullString] DOMString path, in Flags flags) raises (FileException);
     39        [Custom] FileEntrySync getFile(in [ConvertUndefinedOrNullToNullString] DOMString path, in WebKitFlags flags) raises (FileException);
     40        [Custom] DirectoryEntrySync getDirectory(in [ConvertUndefinedOrNullToNullString] DOMString path, in WebKitFlags flags) raises (FileException);
    4141        void removeRecursively() raises (FileException);
    4242    };

  • trunk/Source/WebCore/fileapi/WebKitFlags.h

    r84223 r84224  
    2929 */
    3030
    31 #ifndef Flags_h
    32 #define Flags_h
     31#ifndef WebKitFlags_h
     32#define WebKitFlags_h
    3333
    3434#if ENABLE(FILE_SYSTEM)
    … …  
    3939namespace WebCore {
    4040
    41 class Flags : public RefCounted<Flags> {
     41class WebKitFlags : public RefCounted<WebKitFlags> {
    4242public:
    43     static PassRefPtr<Flags> create(bool create = false, bool exclusive = false)
     43    static PassRefPtr<WebKitFlags> create(bool create = false, bool exclusive = false)
    4444    {
    45         return adoptRef(new Flags(create, exclusive));
     45        return adoptRef(new WebKitFlags(create, exclusive));
    4646    }
    4747
    … …  
    5252
    5353private:
    54     Flags(bool create, bool exclusive)
     54    WebKitFlags(bool create, bool exclusive)
    5555        : m_create(create)
    5656        , m_exclusive(exclusive)
    … …  
    6565#endif // ENABLE(FILE_SYSTEM)
    6666
    67 #endif // Flags_h
     67#endif // WebKitFlags_h

  • trunk/Source/WebCore/fileapi/WebKitFlags.idl

    r84223 r84224  
    3434        CanBeConstructed,
    3535        NoStaticTables
    36     ] Flags {
     36    ] WebKitFlags {
    3737        attribute boolean create;
    3838        attribute boolean exclusive;

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r84053 r84224  
    745745
    746746#if ENABLE(FILE_SYSTEM)
    747 void DOMWindow::requestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
     747void DOMWindow::webkitRequestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
    748748{
    749749    Document* document = this->document();
    … …  
    765765}
    766766
    767 void DOMWindow::resolveLocalFileSystemURL(const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
     767void DOMWindow::webkitResolveLocalFileSystemURL(const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
    768768{
    769769    Document* document = this->document();

  • trunk/Source/WebCore/page/DOMWindow.h

    r84053 r84224  
    390390            EXTERNAL,
    391391        };
    392         void requestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback>, PassRefPtr<ErrorCallback>);
    393         void resolveLocalFileSystemURL(const String&, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
     392        void webkitRequestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback>, PassRefPtr<ErrorCallback>);
     393        void webkitResolveLocalFileSystemURL(const String&, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
    394394#endif
    395395

  • trunk/Source/WebCore/page/DOMWindow.idl

    r84053 r84224  
    195195        const unsigned short TEMPORARY = 0;
    196196        const unsigned short PERSISTENT = 1;
    197         [EnabledAtRuntime=FileSystem] void requestFileSystem(in unsigned short type, in long long size, in [Callback, Optional] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
    198         [EnabledAtRuntime=FileSystem] void resolveLocalFileSystemURL(in DOMString url, in [Callback, Optional] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
    199 
    200         attribute [EnabledAtRuntime=FileSystem] FlagsConstructor Flags;
     197        [EnabledAtRuntime=FileSystem] void webkitRequestFileSystem(in unsigned short type, in long long size, in [Callback, Optional] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
     198        [EnabledAtRuntime=FileSystem] void webkitResolveLocalFileSystemURL(in DOMString url, in [Callback, Optional] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
     199
     200        attribute [EnabledAtRuntime=FileSystem] WebKitFlagsConstructor WebKitFlags;
    201201#endif
    202202

  • trunk/Source/WebCore/workers/WorkerContext.cpp

    r84125 r84224  
    351351
    352352#if ENABLE(FILE_SYSTEM)
    353 void WorkerContext::requestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
     353void WorkerContext::webkitRequestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
    354354{
    355355    if (!AsyncFileSystem::isAvailable() || !securityOrigin()->canAccessFileSystem()) {
    … …  
    367367}
    368368
    369 PassRefPtr<DOMFileSystemSync> WorkerContext::requestFileSystemSync(int type, long long size, ExceptionCode& ec)
     369PassRefPtr<DOMFileSystemSync> WorkerContext::webkitRequestFileSystemSync(int type, long long size, ExceptionCode& ec)
    370370{
    371371    ec = 0;
    … …  
    386386}
    387387
    388 void WorkerContext::resolveLocalFileSystemURL(const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
     388void WorkerContext::webkitResolveLocalFileSystemURL(const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
    389389{
    390390    KURL completedURL = completeURL(url);
    … …  
    404404}
    405405
    406 PassRefPtr<EntrySync> WorkerContext::resolveLocalFileSystemSyncURL(const String& url, ExceptionCode& ec)
     406PassRefPtr<EntrySync> WorkerContext::webkitResolveLocalFileSystemSyncURL(const String& url, ExceptionCode& ec)
    407407{
    408408    ec = 0;

  • trunk/Source/WebCore/workers/WorkerContext.h

    r84125 r84224  
    134134            EXTERNAL,
    135135        };
    136         void requestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback>);
    137         PassRefPtr<DOMFileSystemSync> requestFileSystemSync(int type, long long size, ExceptionCode&);
    138         void resolveLocalFileSystemURL(const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback>);
    139         PassRefPtr<EntrySync> resolveLocalFileSystemSyncURL(const String& url, ExceptionCode&);
     136        void webkitRequestFileSystem(int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback>);
     137        PassRefPtr<DOMFileSystemSync> webkitRequestFileSystemSync(int type, long long size, ExceptionCode&);
     138        void webkitResolveLocalFileSystemURL(const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback>);
     139        PassRefPtr<EntrySync> webkitResolveLocalFileSystemSyncURL(const String& url, ExceptionCode&);
    140140#endif
    141141#if ENABLE(INSPECTOR)

  • trunk/Source/WebCore/workers/WorkerContext.idl

    r83884 r84224  
    109109        const unsigned short TEMPORARY = 0;
    110110        const unsigned short PERSISTENT = 1;
    111         [EnabledAtRuntime=FileSystem] void requestFileSystem(in unsigned short type, in long long size, in [Callback, Optional] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
    112         [EnabledAtRuntime=FileSystem] DOMFileSystemSync requestFileSystemSync(in unsigned short type, in long long size) raises (FileException);
    113         [EnabledAtRuntime=FileSystem] void resolveLocalFileSystemURL(in DOMString url, in [Callback, Optional] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
    114         [EnabledAtRuntime=FileSystem] EntrySync resolveLocalFileSystemSyncURL(in DOMString url) raises (FileException);
     111        [EnabledAtRuntime=FileSystem] void webkitRequestFileSystem(in unsigned short type, in long long size, in [Callback, Optional] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
     112        [EnabledAtRuntime=FileSystem] DOMFileSystemSync webkitRequestFileSystemSync(in unsigned short type, in long long size) raises (FileException);
     113        [EnabledAtRuntime=FileSystem] void webkitResolveLocalFileSystemURL(in DOMString url, in [Callback, Optional] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
     114        [EnabledAtRuntime=FileSystem] EntrySync webkitResolveLocalFileSystemSyncURL(in DOMString url) raises (FileException);
    115115
    116                  attribute [EnabledAtRuntime=FileSystem] FlagsConstructor Flags;
     116                 attribute [EnabledAtRuntime=FileSystem] WebKitFlagsConstructor WebKitFlags;
    117117                 attribute [EnabledAtRuntime=FileSystem] FileErrorConstructor FileError;
    118118                 attribute [EnabledAtRuntime=FileSystem] FileExceptionConstructor FileException;
Note: See TracChangeset for help on using the changeset viewer.