Changeset 84053 in webkit


Ignore:
Timestamp:
Apr 15, 2011 4:58:43 PM (13 years ago)
Author:
kinuko@chromium.org
Message:

2011-04-15 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by David Levin.

Expose unified Quota API if QUOTA build flag is enabled
​https://bugs.webkit.org/show_bug.cgi?id=58648

  • src/AssertMatchingEnums.cpp: Added enum assertions.
  • src/StorageInfoChromium.cpp: Made a build fix.

2011-04-15 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by David Levin.

Expose unified Quota API if QUOTA build flag is enabled
​https://bugs.webkit.org/show_bug.cgi?id=58648

Test: storage/storageinfo-query-usage.html

  • CMakeLists.txt: Added new file entries.
  • DerivedSources.cpp: Added new file entries.
  • DerivedSources.make: Added new file entries.
  • GNUmakefile.am: Added new file entries.
  • WebCore.gypi: Added new file entries.
  • WebCore.vcproj/WebCore.vcproj: Added new file entries.
  • WebCore.xcodeproj/project.pbxproj: Added new file entries.
  • page/DOMWindow.cpp: (WebCore::DOMWindow::webkitStorageInfo): Added.
  • page/DOMWindow.h:
  • page/DOMWindow.idl:
  • storage/StorageInfo.h: Added storage type enum.
  • storage/StorageInfo.idl: Added.
  • storage/StorageInfoErrorCallback.idl: Added.
  • storage/StorageInfoUsageCallback.idl: Added.

2011-04-15 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by David Levin.

Expose unified Quota API if QUOTA build flag is enabled
​https://bugs.webkit.org/show_bug.cgi?id=58648

Added a layout test, also added skipped entries on platforms
where the QUOTA flag is not enabled.

  • platform/chromium/test_expectations.txt:
  • platform/gtk/Skipped:
  • platform/mac/Skipped:
  • platform/qt/Skipped:
  • platform/win/Skipped:
  • storage/script-tests/TEMPLATE.html: Added.
  • storage/script-tests/storageinfo-query-usage.js: Added.
  • storage/storageinfo-query-usage-expected.txt: Added.
  • storage/storageinfo-query-usage.html: Added.
Location:
trunk
Files:
8 added
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r84052 r84053  
     12011-04-15  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by David Levin.
     4
     5        Expose unified Quota API if QUOTA build flag is enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=58648
     7
     8        Added a layout test, also added skipped entries on platforms
     9        where the QUOTA flag is not enabled.
     10
     11        * platform/chromium/test_expectations.txt:
     12        * platform/gtk/Skipped:
     13        * platform/mac/Skipped:
     14        * platform/qt/Skipped:
     15        * platform/win/Skipped:
     16        * storage/script-tests/TEMPLATE.html: Added.
     17        * storage/script-tests/storageinfo-query-usage.js: Added.
     18        * storage/storageinfo-query-usage-expected.txt: Added.
     19        * storage/storageinfo-query-usage.html: Added.
     20
    1212011-04-15  Oliver Hunt  <oliver@apple.com>
    222

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r84039 r84053  
    204204// TODO: move to platform/chromium-linux/.
    205205WONTFIX SKIP MAC WIN : platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html = FAIL
     206
     207// Quota API is not yet enabled by default.
     208BUGCR61676 SKIP : storage/storageinfo-query-usage.html = FAIL
    206209
    207210// -----------------------------------------------------------------
    … …  
    35363539
    35373540BUGWK58619 GPU LINUX WIN : media/video-volume-slider.html = IMAGE
     3541

  • trunk/LayoutTests/platform/gtk/Skipped

    r83979 r84053  
    13791379# https://bugs.webkit.org/show_bug.cgi?id=58667
    13801380editing/selection/select-out-of-editable.html
     1381
     1382# Quota API is not supported.
     1383storage/storageinfo-query-usage.html

  • trunk/LayoutTests/platform/mac/Skipped

    r83947 r84053  
    322322# https://bugs.webkit.org/show_bug.cgi?id=58515
    323323compositing/overflow/clip-content-under-overflow-controls.html
     324
     325# Quota API is not supported.
     326storage/storageinfo-query-usage.html

  • trunk/LayoutTests/platform/qt/Skipped

    r84040 r84053  
    34973497http/tests/loading/cross-origin-XHR-willLoadRequest.html
    34983498http/tests/misc/redirect-to-external-url.html
     3499
     3500# Quota API is not yet supported.
     3501storage/storageinfo-query-usage.html

  • trunk/LayoutTests/platform/win/Skipped

    r84028 r84053  
    12331233fast/dom/Range/scale-page-client-rects.html
    12341234fast/repaint/scale-page-shrink.html
     1235
     1236# Quota API is not supported.
     1237storage/storageinfo-query-usage.html

  • trunk/Source/WebCore/CMakeLists.txt

    r84039 r84053  
    380380    storage/Storage.idl
    381381    storage/StorageEvent.idl
     382    storage/StorageInfo.idl
     383    storage/StorageInfoErrorCallback.idl
     384    storage/StorageInfoUsageCallback.idl
    382385
    383386    webaudio/AudioBuffer.idl
    … …  
    13371340    storage/StorageEvent.cpp
    13381341    storage/StorageEventDispatcher.cpp
     1342    storage/StorageInfo.cpp
    13391343    storage/StorageMap.cpp
    13401344    storage/StorageNamespace.cpp
    … …  
    19701974ENDIF ()
    19711975
    1972 if (ENABLE_QUOTA)
    1973     LIST(APPEND WebCore_SOURCES
    1974         storage/StorageInfo.cpp
    1975     )
    1976 ENDIF ()
    1977 
    19781976
    19791977# Modules that the bindings generator scripts may use

  • trunk/Source/WebCore/ChangeLog

    r84052 r84053  
     12011-04-15  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by David Levin.
     4
     5        Expose unified Quota API if QUOTA build flag is enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=58648
     7
     8        Test: storage/storageinfo-query-usage.html
     9
     10        * CMakeLists.txt: Added new file entries.
     11        * DerivedSources.cpp: Added new file entries.
     12        * DerivedSources.make: Added new file entries.
     13        * GNUmakefile.am: Added new file entries.
     14        * WebCore.gypi: Added new file entries.
     15        * WebCore.vcproj/WebCore.vcproj: Added new file entries.
     16        * WebCore.xcodeproj/project.pbxproj: Added new file entries.
     17        * page/DOMWindow.cpp:
     18        (WebCore::DOMWindow::webkitStorageInfo): Added.
     19        * page/DOMWindow.h:
     20        * page/DOMWindow.idl:
     21        * storage/StorageInfo.h: Added storage type enum.
     22        * storage/StorageInfo.idl: Added.
     23        * storage/StorageInfoErrorCallback.idl: Added.
     24        * storage/StorageInfoUsageCallback.idl: Added.
     25
    1262011-04-15  Oliver Hunt  <oliver@apple.com>
    227

  • trunk/Source/WebCore/CodeGenerators.pri

    r83884 r84053  
    363363    storage/Storage.idl \
    364364    storage/StorageEvent.idl \
     365    storage/StorageInfo.idl \
     366    storage/StorageInfoErrorCallback.idl \
     367    storage/StorageInfoUsageCallback.idl \
    365368    storage/SQLError.idl \
    366369    storage/SQLException.idl \

  • trunk/Source/WebCore/DerivedSources.cpp

    r83884 r84053  
    286286#include "JSStorage.cpp"
    287287#include "JSStorageEvent.cpp"
     288#include "JSStorageInfo.cpp"
     289#include "JSStorageInfoErrorCallback.cpp"
     290#include "JSStorageInfoUsageCallback.cpp"
    288291#include "JSStringCallback.cpp"
    289292#include "JSStyleMedia.cpp"

  • trunk/Source/WebCore/DerivedSources.make

    r83952 r84053  
    357357    Storage \
    358358    StorageEvent \
     359    StorageInfo \
     360    StorageInfoErrorCallback \
     361    StorageInfoUsageCallback \
    359362    StringCallback \
    360363    SVGAElement \

  • trunk/Source/WebCore/GNUmakefile.am

    r83952 r84053  
    255255FEATURE_DEFINES += ENABLE_QUOTA=1
    256256webcore_cppflags += -DENABLE_QUOTA=1
     257webcore_built_sources += \
     258        DerivedSources/WebCore/JSStorageInfo.cpp \
     259        DerivedSources/WebCore/JSStorageInfo.h \
     260        DerivedSources/WebCore/JSStorageInfoErrorCallback.cpp \
     261        DerivedSources/WebCore/JSStorageInfoErrorCallback.h \
     262        DerivedSources/WebCore/JSStorageInfoUsageCallback.cpp \
     263        DerivedSources/WebCore/JSStorageInfoUsageCallback.h
    257264endif # END ENABLE_QUOTA
    258265

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

    r84039 r84053  
    454454        DerivedSources/WebCore/JSSQLTransactionSync.h \
    455455        DerivedSources/WebCore/JSStorage.h \
     456        DerivedSources/WebCore/JSStorageInfo.h \
     457        DerivedSources/WebCore/JSStorageInfoErrorCallback.h \
     458        DerivedSources/WebCore/JSStorageInfoUsageCallback.h \
    456459        DerivedSources/WebCore/JSStyleMedia.cpp \
    457460        DerivedSources/WebCore/JSStyleMedia.h \
    … …  
    31813184        Source/WebCore/storage/StorageAreaSync.h \
    31823185        Source/WebCore/storage/Storage.cpp \
     3186        Source/WebCore/storage/Storage.h \
    31833187        Source/WebCore/storage/StorageEvent.cpp \
     3188        Source/WebCore/storage/StorageEvent.h \
    31843189        Source/WebCore/storage/StorageEventDispatcher.cpp \
    31853190        Source/WebCore/storage/StorageEventDispatcher.h \
    3186         Source/WebCore/storage/StorageEvent.h \
    3187         Source/WebCore/storage/Storage.h \
     3191        Source/WebCore/storage/StorageInfo.cpp \
     3192        Source/WebCore/storage/StorageInfo.h \
     3193        Source/WebCore/storage/StorageInfoErrorCallback.h \
     3194        Source/WebCore/storage/StorageInfoUsageCallback.h \
    31883195        Source/WebCore/storage/StorageMap.cpp \
    31893196        Source/WebCore/storage/StorageMap.h \

  • trunk/Source/WebCore/WebCore.gypi

    r84039 r84053  
    13781378            'storage/Storage.idl',
    13791379            'storage/StorageEvent.idl',
     1380            'storage/StorageInfo.idl',
     1381            'storage/StorageInfoErrorCallback.idl',
     1382            'storage/StorageInfoUsageCallback.idl',
    13801383            'webaudio/AudioBuffer.idl',
    13811384            'webaudio/AudioBufferSourceNode.idl',
    … …  
    78557858            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStorageEvent.cpp',
    78567859            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStorageEvent.h',
     7860            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStorageInfo.cpp',
     7861            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStorageInfo.h',
     7862            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStorageInfoErrorCallback.cpp',
     7863            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStorageInfoErrorCallback.h',
     7864            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStorageInfoUsageCallback.cpp',
     7865            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStorageInfoUsageCallback.h',
    78577866            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStyleMedia.cpp',
    78587867            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSStyleMedia.h',

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

    r84044 r84053  
    1367113671                        </File>
    1367213672                        <File
     13673                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfo.cpp"
     13674                                >
     13675                        </File>
     13676                        <File
     13677                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfo.h"
     13678                                >
     13679                        </File>
     13680                        <File
     13681                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoErrorCallback.cpp"
     13682                                >
     13683                        </File>
     13684                        <File
     13685                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoErrorCallback.h"
     13686                                >
     13687                        </File>
     13688                        <File
     13689                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoUsageCallback.cpp"
     13690                                >
     13691                        </File>
     13692                        <File
     13693                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoUsageCallback.h"
     13694                                >
     13695                        </File>
     13696                        <File
    1367313697                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStringCallback.cpp"
    1367413698                                >

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

    r84039 r84053  
    26642664                892CF1EC134C655500AAEDA1 /* StorageInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 892CF1EA134C655500AAEDA1 /* StorageInfo.cpp */; };
    26652665                892CF1ED134C655500AAEDA1 /* StorageInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 892CF1EB134C655500AAEDA1 /* StorageInfo.h */; };
     2666                892CF20B134C8BB300AAEDA1 /* JSStorageInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 892CF203134C8BB300AAEDA1 /* JSStorageInfo.cpp */; };
     2667                892CF20C134C8BB300AAEDA1 /* JSStorageInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 892CF204134C8BB300AAEDA1 /* JSStorageInfo.h */; };
     2668                892CF20D134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 892CF205134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.cpp */; };
     2669                892CF20E134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 892CF206134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.h */; };
     2670                892CF211134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 892CF209134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.cpp */; };
     2671                892CF212134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 892CF20A134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.h */; };
    26662672                893C47A71238908B002B3D86 /* FileCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 893C47A51238908B002B3D86 /* FileCallback.h */; };
    26672673                893C47A81238908B002B3D86 /* FileWriterCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 893C47A61238908B002B3D86 /* FileWriterCallback.h */; };
    … …  
    92129218                892CF1EA134C655500AAEDA1 /* StorageInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageInfo.cpp; sourceTree = "<group>"; };
    92139219                892CF1EB134C655500AAEDA1 /* StorageInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageInfo.h; sourceTree = "<group>"; };
     9220                892CF203134C8BB300AAEDA1 /* JSStorageInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStorageInfo.cpp; sourceTree = "<group>"; };
     9221                892CF204134C8BB300AAEDA1 /* JSStorageInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStorageInfo.h; sourceTree = "<group>"; };
     9222                892CF205134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStorageInfoErrorCallback.cpp; sourceTree = "<group>"; };
     9223                892CF206134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStorageInfoErrorCallback.h; sourceTree = "<group>"; };
     9224                892CF209134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStorageInfoUsageCallback.cpp; sourceTree = "<group>"; };
     9225                892CF20A134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStorageInfoUsageCallback.h; sourceTree = "<group>"; };
    92149226                893C47A51238908B002B3D86 /* FileCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileCallback.h; path = fileapi/FileCallback.h; sourceTree = "<group>"; };
    92159227                893C47A61238908B002B3D86 /* FileWriterCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterCallback.h; path = fileapi/FileWriterCallback.h; sourceTree = "<group>"; };
    … …  
    1553415546                                2E2D99CB10E2BBDA00496337 /* JSBlob.cpp */,
    1553515547                                2E2D99CC10E2BBDA00496337 /* JSBlob.h */,
    15536                                 89CD029111C85B870070B791 /* JSWebKitBlobBuilder.cpp */,
    15537                                 89CD029211C85B870070B791 /* JSWebKitBlobBuilder.h */,
    1553815548                                89878586122CA26A003AABDA /* JSDirectoryEntry.cpp */,
    1553915549                                89878587122CA26A003AABDA /* JSDirectoryEntry.h */,
    … …  
    1559215602                                898785A2122CA2A7003AABDA /* JSMetadataCallback.cpp */,
    1559315603                                898785A3122CA2A7003AABDA /* JSMetadataCallback.h */,
     15604                                89CD029111C85B870070B791 /* JSWebKitBlobBuilder.cpp */,
     15605                                89CD029211C85B870070B791 /* JSWebKitBlobBuilder.h */,
    1559415606                        );
    1559515607                        name = FileAPI;
    … …  
    1616116173                                976D6C59122B8A3D001FD1F7 /* Blob.cpp */,
    1616216174                                976D6C5A122B8A3D001FD1F7 /* Blob.h */,
    16163                                 976D6C5C122B8A3D001FD1F7 /* WebKitBlobBuilder.cpp */,
    16164                                 976D6C5D122B8A3D001FD1F7 /* WebKitBlobBuilder.h */,
    1616516175                                976D6C5F122B8A3D001FD1F7 /* BlobURL.cpp */,
    1616616176                                976D6C60122B8A3D001FD1F7 /* BlobURL.h */,
    … …  
    1623716247                                976D6C75122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp */,
    1623816248                                976D6C76122B8A3D001FD1F7 /* ThreadableBlobRegistry.h */,
     16249                                976D6C5C122B8A3D001FD1F7 /* WebKitBlobBuilder.cpp */,
     16250                                976D6C5D122B8A3D001FD1F7 /* WebKitBlobBuilder.h */,
    1623916251                        );
    1624016252                        name = fileapi;
    … …  
    1713917151                                51E0BAE80DA55D4A00A9E417 /* JSStorageEvent.cpp */,
    1714017152                                51E0BAE90DA55D4A00A9E417 /* JSStorageEvent.h */,
     17153                                892CF203134C8BB300AAEDA1 /* JSStorageInfo.cpp */,
     17154                                892CF204134C8BB300AAEDA1 /* JSStorageInfo.h */,
     17155                                892CF205134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.cpp */,
     17156                                892CF206134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.h */,
     17157                                892CF209134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.cpp */,
     17158                                892CF20A134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.h */,
    1714117159                        );
    1714217160                        name = Storage;
    … …  
    1868118699                                7E33CD00127F340D00BE8F17 /* PurgePriority.h */,
    1868218700                                1C63A2460F71646600C09D5A /* RunLoopTimer.h */,
     18701                                293EAE201356B32E0067ACF9 /* RuntimeApplicationChecks.cpp */,
    1868318702                                293EAE1E1356B2FE0067ACF9 /* RuntimeApplicationChecks.h */,
    1868418703                                5162C7F211F77EFA00612EFE /* SchemeRegistry.cpp */,
    … …  
    1872418743                                9380F47209A11AB4001FDB34 /* Widget.h */,
    1872518744                                E1E1BEFF115FF6FB006F52CA /* WindowsKeyboardCodes.h */,
    18726                                 293EAE201356B32E0067ACF9 /* RuntimeApplicationChecks.cpp */,
    1872718745                        );
    1872818746                        path = platform;
    … …  
    1983719855                        buildActionMask = 2147483647;
    1983819856                        files = (
    19839                                 293EAE1F1356B2FE0067ACF9 /* RuntimeApplicationChecks.h in Headers */,
    1984019857                                B5B5DC6A119BB3D5002A8790 /* AbstractDatabase.h in Headers */,
    1984119858                                41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */,
    … …  
    1995919976                                A89943280B42338800D7C802 /* BitmapImage.h in Headers */,
    1996019977                                976D6C79122B8A3D001FD1F7 /* Blob.h in Headers */,
    19961                                 976D6C7C122B8A3D001FD1F7 /* WebKitBlobBuilder.h in Headers */,
    1996219978                                2EDEF1F4121B0EFC00726DB2 /* BlobData.h in Headers */,
    1996319979                                2EDEF1F5121B0EFC00726DB2 /* BlobRegistry.h in Headers */,
    … …  
    2131221328                                B27535700B053814002CE64F /* Image.h in Headers */,
    2131321329                                B2A10B920B3818BD00099AA4 /* ImageBuffer.h in Headers */,
     21330                                22BD9F7F1353625C009BD102 /* ImageBufferData.h in Headers */,
     21331                                22BD9F81135364FE009BD102 /* ImageBufferDataCG.h in Headers */,
    2131421332                                A779791A0D6B9D0C003851B9 /* ImageData.h in Headers */,
    2131521333                                97205AB61239291000B17380 /* ImageDocument.h in Headers */,
    … …  
    2142121439                                51721FD311D27EF200638B42 /* JSBeforeProcessEvent.h in Headers */,
    2142221440                                2E2D99CE10E2BBDA00496337 /* JSBlob.h in Headers */,
    21423                                 89CD029411C85B870070B791 /* JSWebKitBlobBuilder.h in Headers */,
    2142421441                                1449E24C107D4A8400B5793F /* JSCallbackData.h in Headers */,
    2142521442                                65DF323A09D1DE65000BE325 /* JSCanvasGradient.h in Headers */,
    … …  
    2170721724                                B55D5AA4119131FC00BCC315 /* JSSQLTransactionSyncCallback.h in Headers */,
    2170821725                                51E0BAEB0DA55D4A00A9E417 /* JSStorageEvent.h in Headers */,
     21726                                892CF20C134C8BB300AAEDA1 /* JSStorageInfo.h in Headers */,
     21727                                892CF20E134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.h in Headers */,
     21728                                892CF212134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.h in Headers */,
    2170921729                                0FF5026A102BA9430066F39A /* JSStyleMedia.h in Headers */,
    2171021730                                BCE0139B0C0BEF180043860A /* JSStyleSheet.h in Headers */,
    … …  
    2187021890                                31C0FF3E0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h in Headers */,
    2187121891                                319461FF13022BB8004BB3F8 /* JSWebKitAnimationList.h in Headers */,
     21892                                89CD029411C85B870070B791 /* JSWebKitBlobBuilder.h in Headers */,
    2187221893                                316FE0720E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h in Headers */,
    2187321894                                316FE0740E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h in Headers */,
    … …  
    2228322304                                1A569D230D7E2B82007C3983 /* runtime_object.h in Headers */,
    2228422305                                1A569D250D7E2B82007C3983 /* runtime_root.h in Headers */,
     22306                                293EAE1F1356B2FE0067ACF9 /* RuntimeApplicationChecks.h in Headers */,
    2228522307                                8C6EA61A11EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h in Headers */,
    2228622308                                49E911CB0EF86D47009D0CAF /* ScaleTransformOperation.h in Headers */,
    … …  
    2242022442                                C5EBDD84105EDDEC0056816F /* StorageEventDispatcher.h in Headers */,
    2242122443                                892CF1ED134C655500AAEDA1 /* StorageInfo.h in Headers */,
     22444                                892CF1ED134C655500AAEDA1 /* StorageInfo.h in Headers */,
     22445                                892CF192134C620D00AAEDA1 /* StorageInfoErrorCallback.h in Headers */,
    2242222446                                892CF192134C620D00AAEDA1 /* StorageInfoErrorCallback.h in Headers */,
    2242322447                                892CF193134C620D00AAEDA1 /* StorageInfoQuotaCallback.h in Headers */,
     22448                                892CF193134C620D00AAEDA1 /* StorageInfoQuotaCallback.h in Headers */,
     22449                                892CF194134C620D00AAEDA1 /* StorageInfoUsageCallback.h in Headers */,
    2242422450                                892CF194134C620D00AAEDA1 /* StorageInfoUsageCallback.h in Headers */,
    2242522451                                51E0BB380DA5ACB600A9E417 /* StorageMap.h in Headers */,
    … …  
    2281322839                                31C0FF220E4CEB6E007D6FE5 /* WebKitAnimationEvent.h in Headers */,
    2281422840                                319E69B613299BBD004AC91A /* WebKitAnimationList.h in Headers */,
     22841                                976D6C7C122B8A3D001FD1F7 /* WebKitBlobBuilder.h in Headers */,
    2281522842                                31288E730E3005D6003619AE /* WebKitCSSKeyframeRule.h in Headers */,
    2281622843                                31288E750E3005D6003619AE /* WebKitCSSKeyframesRule.h in Headers */,
    … …  
    2293322960                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
    2293422961                                977E2E0F12F0FC9C00C13379 /* XSSFilter.h in Headers */,
    22935                                 22BD9F7F1353625C009BD102 /* ImageBufferData.h in Headers */,
    22936                                 22BD9F81135364FE009BD102 /* ImageBufferDataCG.h in Headers */,
    2293722962                        );
    2293822963                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2332123346                                A89943290B42338800D7C802 /* BitmapImage.cpp in Sources */,
    2332223347                                976D6C78122B8A3D001FD1F7 /* Blob.cpp in Sources */,
    23323                                 976D6C7B122B8A3D001FD1F7 /* WebKitBlobBuilder.cpp in Sources */,
    2332423348                                2EDEF1F3121B0EFC00726DB2 /* BlobData.cpp in Sources */,
    2332523349                                2EDEF1F6121B0EFC00726DB2 /* BlobRegistryImpl.cpp in Sources */,
    … …  
    2412524149                                B275356F0B053814002CE64F /* Image.cpp in Sources */,
    2412624150                                B2A10B940B3818D700099AA4 /* ImageBufferCG.cpp in Sources */,
     24151                                2292B27C1356669400CF11EF /* ImageBufferDataCG.cpp in Sources */,
    2412724152                                B275355E0B053814002CE64F /* ImageCG.cpp in Sources */,
    2412824153                                A77979190D6B9D0C003851B9 /* ImageData.cpp in Sources */,
    … …  
    2423024255                                51721FD211D27EF200638B42 /* JSBeforeProcessEvent.cpp in Sources */,
    2423124256                                2E2D99CD10E2BBDA00496337 /* JSBlob.cpp in Sources */,
    24232                                 89CD029311C85B870070B791 /* JSWebKitBlobBuilder.cpp in Sources */,
    2423324257                                1449E287107D4DB400B5793F /* JSCallbackData.cpp in Sources */,
    2423424258                                65DF323909D1DE65000BE325 /* JSCanvasGradient.cpp in Sources */,
    … …  
    2460224626                                51D0C5160DAA90B7003B3831 /* JSStorageCustom.cpp in Sources */,
    2460324627                                51E0BAEA0DA55D4A00A9E417 /* JSStorageEvent.cpp in Sources */,
     24628                                892CF20B134C8BB300AAEDA1 /* JSStorageInfo.cpp in Sources */,
     24629                                892CF20D134C8BB300AAEDA1 /* JSStorageInfoErrorCallback.cpp in Sources */,
     24630                                892CF211134C8BB300AAEDA1 /* JSStorageInfoUsageCallback.cpp in Sources */,
    2460424631                                0FF50269102BA9430066F39A /* JSStyleMedia.cpp in Sources */,
    2460524632                                BCE0139A0C0BEF180043860A /* JSStyleSheet.cpp in Sources */,
    … …  
    2477824805                                319461FE13022BB8004BB3F8 /* JSWebKitAnimationList.cpp in Sources */,
    2477924806                                3194623213022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp in Sources */,
     24807                                89CD029311C85B870070B791 /* JSWebKitBlobBuilder.cpp in Sources */,
    2478024808                                316FE0710E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp in Sources */,
    2478124809                                E1AD14C51297354900ACA989 /* JSWebKitCSSKeyframeRuleCustom.cpp in Sources */,
    … …  
    2512025148                                1A569D220D7E2B82007C3983 /* runtime_object.cpp in Sources */,
    2512125149                                1A569D240D7E2B82007C3983 /* runtime_root.cpp in Sources */,
     25150                                293EAE211356B32E0067ACF9 /* RuntimeApplicationChecks.cpp in Sources */,
    2512225151                                8C6EA61911EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp in Sources */,
    2512325152                                49E911CA0EF86D47009D0CAF /* ScaleTransformOperation.cpp in Sources */,
    … …  
    2552525554                                31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */,
    2552625555                                319E69B513299BBD004AC91A /* WebKitAnimationList.cpp in Sources */,
     25556                                976D6C7B122B8A3D001FD1F7 /* WebKitBlobBuilder.cpp in Sources */,
    2552725557                                31288E720E3005D6003619AE /* WebKitCSSKeyframeRule.cpp in Sources */,
    2552825558                                31288E740E3005D6003619AE /* WebKitCSSKeyframesRule.cpp in Sources */,
    … …  
    2563525665                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
    2563625666                                977E2E0E12F0FC9C00C13379 /* XSSFilter.cpp in Sources */,
    25637                                 2292B27C1356669400CF11EF /* ImageBufferDataCG.cpp in Sources */,
    25638                                 293EAE211356B32E0067ACF9 /* RuntimeApplicationChecks.cpp in Sources */,
    2563925667                        );
    2564025668                        runOnlyForDeploymentPostprocessing = 0;

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

    r83972 r84053  
    8787#include "Storage.h"
    8888#include "StorageArea.h"
     89#include "StorageInfo.h"
    8990#include "StorageNamespace.h"
    9091#include "StyleMedia.h"
    … …  
    787788}
    788789
     790COMPILE_ASSERT(static_cast<int>(DOMWindow::EXTERNAL) == static_cast<int>(AsyncFileSystem::External), enum_mismatch);
     791
    789792COMPILE_ASSERT(static_cast<int>(DOMWindow::TEMPORARY) == static_cast<int>(AsyncFileSystem::Temporary), enum_mismatch);
    790793COMPILE_ASSERT(static_cast<int>(DOMWindow::PERSISTENT) == static_cast<int>(AsyncFileSystem::Persistent), enum_mismatch);
    791 COMPILE_ASSERT(static_cast<int>(DOMWindow::EXTERNAL) == static_cast<int>(AsyncFileSystem::External), enum_mismatch);
    792794
    793795#endif
    … …  
    18631865#endif
    18641866
     1867#if ENABLE(QUOTA)
     1868StorageInfo* DOMWindow::webkitStorageInfo() const
     1869{
     1870    if (!m_storageInfo)
     1871        m_storageInfo = StorageInfo::create();
     1872    return m_storageInfo.get();
     1873}
     1874#endif
     1875
    18651876} // namespace WebCore

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

    r83972 r84053  
    6565    class SerializedScriptValue;
    6666    class Storage;
     67    class StorageInfo;
    6768    class StyleMedia;
    6869    class WebKitPoint;
    … …  
    401402#endif
    402403
     404#if ENABLE(QUOTA)
     405        StorageInfo* webkitStorageInfo() const;
     406#endif
     407
    403408#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    404409        DOMApplicationCache* applicationCache() const;
    … …  
    493498        mutable RefPtr<DOMURL> m_domURL;
    494499#endif
     500
     501#if ENABLE(QUOTA)
     502        mutable RefPtr<StorageInfo> m_storageInfo;
     503#endif
    495504    };
    496505

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

    r83884 r84053  
    787787        readonly attribute [Conditional=BLOB] DOMURL webkitURL;
    788788
     789        readonly attribute [Conditional=QUOTA] StorageInfo webkitStorageInfo;
     790
    789791#endif // defined(LANGUAGE_JAVASCRIPT)
    790792

  • trunk/Source/WebCore/storage/StorageInfo.h

    r83729 r84053  
    4646class StorageInfo : public RefCounted<StorageInfo> {
    4747public:
     48    enum {
     49        TEMPORARY,
     50        PERSISTENT,
     51    };
     52
    4853    static PassRefPtr<StorageInfo> create()
    4954    {
    … …  
    5257
    5358    void queryUsageAndQuota(ScriptExecutionContext*, int storageType, PassRefPtr<StorageInfoUsageCallback>, PassRefPtr<StorageInfoErrorCallback>);
     59
    5460    void requestQuota(ScriptExecutionContext*, int storageType, unsigned long long newQuotaInBytes, PassRefPtr<StorageInfoQuotaCallback>, PassRefPtr<StorageInfoErrorCallback>);
    5561

  • trunk/Source/WebKit/chromium/ChangeLog

    r83987 r84053  
     12011-04-15  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by David Levin.
     4
     5        Expose unified Quota API if QUOTA build flag is enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=58648
     7
     8        * src/AssertMatchingEnums.cpp: Added enum assertions.
     9        * src/StorageInfoChromium.cpp: Made a build fix.
     10
    1112011-04-15  Vsevolod Vlasov  <vsevik@chromium.org>
    212

  • trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

    r83972 r84053  
    5454#include "PlatformCursor.h"
    5555#include "Settings.h"
     56#include "StorageInfo.h"
    5657#include "TextAffinity.h"
    5758#include "UserContentTypes.h"
    … …  
    7879#include "WebSettings.h"
    7980#include "WebStorageQuotaError.h"
     81#include "WebStorageQuotaType.h"
    8082#include "WebTextAffinity.h"
    8183#include "WebTextCaseSensitivity.h"
    … …  
    421423COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaErrorNotSupported, NOT_SUPPORTED_ERR);
    422424COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaErrorAbort, ABORT_ERR);
     425
     426COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaTypeTemporary, StorageInfo::TEMPORARY);
     427COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaTypePersistent, StorageInfo::PERSISTENT);
     428
     429COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaErrorNotSupported, NOT_SUPPORTED_ERR);
     430COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaErrorAbort, ABORT_ERR);
    423431#endif
    424432

  • trunk/Source/WebKit/chromium/src/StorageInfoChromium.cpp

    r83729 r84053  
    6464    if (storageType != WebStorageQuotaTypeTemporary && storageType != WebStorageQuotaTypePersistent) {
    6565        // Unknown storage type is requested.
    66         fireStorageInfoErrorCallback(NOT_SUPPORTED_ERR);
     66        fireStorageInfoErrorCallback(errorCallback, NOT_SUPPORTED_ERR);
    6767        return;
    6868    }
    … …  
    7373    } else if (errorCallback) {
    7474        // FIXME: calling this on worker is not yet supported.
    75         fireStorageInfoErrorCallback(NOT_SUPPORTED_ERR);
     75        fireStorageInfoErrorCallback(errorCallback, NOT_SUPPORTED_ERR);
    7676    }
    7777}
    … …  
    8282    if (storageType != WebStorageQuotaTypeTemporary && storageType != WebStorageQuotaTypePersistent) {
    8383        // Unknown storage type is requested.
    84         fireStorageInfoErrorCallback(NOT_SUPPORTED_ERR);
     84        fireStorageInfoErrorCallback(errorCallback, NOT_SUPPORTED_ERR);
    8585        return;
    8686    }
    … …  
    9191    } else if (errorCallback) {
    9292        // FIXME: calling this on worker is not yet supported.
    93         fireStorageInfoErrorCallback(NOT_SUPPORTED_ERR);
     93        fireStorageInfoErrorCallback(errorCallback, NOT_SUPPORTED_ERR);
    9494    }
    9595}
Note: See TracChangeset for help on using the changeset viewer.