Changeset 61585 in webkit


Ignore:
Timestamp:
Jun 21, 2010 3:41:58 PM (14 years ago)
Author:
kinuko@chromium.org
Message:

2010-06-21 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Adam Barth.

Add BlobBuilder.idl to expose BlobBuilder interface
​https://bugs.webkit.org/show_bug.cgi?id=40593

BlobBuilder is defined in FileAPI's FileWriter spec.
(​http://dev.w3.org/2009/dap/file-system/file-writer.html)

Also removes the ENABLE_FILE_WRITER ifdef guard for BlobBuilder.

Tests: http/tests/local/blob/send-data-blob.html

http/tests/local/blob/send-hybrid-blob.html
http/tests/local/blob/send-sliced-data-blob.html

  • Android.derived.jscbindings.mk:
  • Android.derived.v8bindings.mk:
  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pri:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • html/BlobBuilder.cpp: (WebCore::BlobBuilder::append):
  • html/BlobBuilder.h:
  • html/BlobBuilder.idl: Added.
  • page/DOMWindow.idl:

2010-06-21 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Adam Barth.

Add BlobBuilder.idl to expose BlobBuilder interface
​https://bugs.webkit.org/show_bug.cgi?id=40593

Add new layout tests to test BlobBuilder interface.
Also update test expectations affected by adding the constructors to DOMWindow.

  • fast/dom/Window/window-properties-expected.txt:
  • fast/dom/Window/window-property-descriptors-expected.txt:
  • fast/dom/constructed-objects-prototypes-expected.txt:
  • fast/dom/prototype-inheritance-2-expected.txt:
  • fast/dom/prototype-inheritance-expected.txt:
  • fast/js/global-constructors-expected.txt:
  • http/tests/local/blob/resources/hybrid-blob-util.js: Added.
  • http/tests/local/blob/script-tests/TEMPLATE.html: Added.
  • http/tests/local/blob/script-tests/send-data-blob.js: Added.
  • http/tests/local/blob/script-tests/send-hybrid-blob.js: Added.
  • http/tests/local/blob/script-tests/send-sliced-data-blob.js: Added.
  • http/tests/local/blob/send-data-blob-expected.txt: Added.
  • http/tests/local/blob/send-data-blob.html: Added.
  • http/tests/local/blob/send-hybrid-blob-expected.txt: Added.
  • http/tests/local/blob/send-hybrid-blob.html: Added.
  • http/tests/local/blob/send-sliced-data-blob-expected.txt: Added.
  • http/tests/local/blob/send-sliced-data-blob.html: Added.
  • http/tests/local/resources/file-for-drag-to-send2.txt: Added.
  • http/tests/resources/post-and-verify-hybrid.cgi: Added.
  • platform/chromium/fast/dom/prototype-inheritance-expected.txt:
  • platform/gtk/Skipped: Added send-hybrid-blob.html and send-sliced-data-blob.html because they need eventSender.beginDragWithFiles Blob.slice.
  • platform/gtk/fast/dom/Window/window-properties-expected.txt:
  • platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt:
  • platform/gtk/fast/dom/prototype-inheritance-expected.txt:
  • platform/qt/Skipped: Added send-hybrid-blob.html and send-sliced-data-blob.html because they need eventSender.beginDragWithFiles Blob.slice.
  • platform/qt/fast/dom/Window/window-properties-expected.txt:
  • platform/qt/fast/dom/Window/window-property-descriptors-expected.txt:
  • platform/qt/fast/dom/prototype-inheritance-expected.txt:
  • platform/win/Skipped: Added send-hybrid-blob.html and send-sliced-data-blob.html because they need eventSender.beginDragWithFiles Blob.slice.
  • platform/win/fast/dom/Window/window-property-descriptors-expected.txt:
  • platform/win/fast/dom/prototype-inheritance-2-expected.txt:
  • platform/win/fast/dom/prototype-inheritance-expected.txt:
Location:
trunk
Files:
34 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r61580 r61585  
     12010-06-21  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Add BlobBuilder.idl to expose BlobBuilder interface
     6        https://bugs.webkit.org/show_bug.cgi?id=40593
     7
     8        Add new layout tests to test BlobBuilder interface.
     9        Also update test expectations affected by adding the constructors to DOMWindow.
     10
     11        * fast/dom/Window/window-properties-expected.txt:
     12        * fast/dom/Window/window-property-descriptors-expected.txt:
     13        * fast/dom/constructed-objects-prototypes-expected.txt:
     14        * fast/dom/prototype-inheritance-2-expected.txt:
     15        * fast/dom/prototype-inheritance-expected.txt:
     16        * fast/js/global-constructors-expected.txt:
     17        * http/tests/local/blob/resources/hybrid-blob-util.js: Added.
     18        * http/tests/local/blob/script-tests/TEMPLATE.html: Added.
     19        * http/tests/local/blob/script-tests/send-data-blob.js: Added.
     20        * http/tests/local/blob/script-tests/send-hybrid-blob.js: Added.
     21        * http/tests/local/blob/script-tests/send-sliced-data-blob.js: Added.
     22        * http/tests/local/blob/send-data-blob-expected.txt: Added.
     23        * http/tests/local/blob/send-data-blob.html: Added.
     24        * http/tests/local/blob/send-hybrid-blob-expected.txt: Added.
     25        * http/tests/local/blob/send-hybrid-blob.html: Added.
     26        * http/tests/local/blob/send-sliced-data-blob-expected.txt: Added.
     27        * http/tests/local/blob/send-sliced-data-blob.html: Added.
     28        * http/tests/local/resources/file-for-drag-to-send2.txt: Added.
     29        * http/tests/resources/post-and-verify-hybrid.cgi: Added.
     30        * platform/chromium/fast/dom/prototype-inheritance-expected.txt:
     31        * platform/gtk/Skipped: Added send-hybrid-blob.html and send-sliced-data-blob.html because they need eventSender.beginDragWithFiles Blob.slice.
     32        * platform/gtk/fast/dom/Window/window-properties-expected.txt:
     33        * platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt:
     34        * platform/gtk/fast/dom/prototype-inheritance-expected.txt:
     35        * platform/qt/Skipped: Added send-hybrid-blob.html and send-sliced-data-blob.html because they need eventSender.beginDragWithFiles Blob.slice.
     36        * platform/qt/fast/dom/Window/window-properties-expected.txt:
     37        * platform/qt/fast/dom/Window/window-property-descriptors-expected.txt:
     38        * platform/qt/fast/dom/prototype-inheritance-expected.txt:
     39        * platform/win/Skipped: Added send-hybrid-blob.html and send-sliced-data-blob.html because they need eventSender.beginDragWithFiles Blob.slice.
     40        * platform/win/fast/dom/Window/window-property-descriptors-expected.txt:
     41        * platform/win/fast/dom/prototype-inheritance-2-expected.txt:
     42        * platform/win/fast/dom/prototype-inheritance-expected.txt:
     43
    1442010-06-21  Robert Hogan  <robert@webkit.org>
    245

  • trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt

    r61564 r61585  
    151151window.Blob [object BlobConstructor]
    152152window.Blob.prototype [object BlobPrototype]
     153window.BlobBuilder [object BlobBuilderConstructor]
     154window.BlobBuilder.prototype [object BlobBuilderPrototype]
     155window.BlobBuilder.prototype.append [function]
     156window.BlobBuilder.prototype.getBlob [function]
    153157window.CDATASection [object CDATASectionConstructor]
    154158window.CDATASection.prototype [object CDATASectionPrototype]

  • trunk/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt

    r61531 r61585  
    99PASS typeof Object.getOwnPropertyDescriptor(window, 'BeforeLoadEvent') is 'object'
    1010PASS typeof Object.getOwnPropertyDescriptor(window, 'Blob') is 'object'
     11PASS typeof Object.getOwnPropertyDescriptor(window, 'BlobBuilder') is 'object'
    1112PASS typeof Object.getOwnPropertyDescriptor(window, 'Boolean') is 'object'
    1213PASS typeof Object.getOwnPropertyDescriptor(window, 'CDATASection') is 'object'

  • trunk/LayoutTests/fast/dom/constructed-objects-prototypes-expected.txt

    r61136 r61585  
    66PASS (new inner.Audio()).isInner is true
    77PASS (new inner.Audio()).constructor.isInner is true
     8PASS (new inner.BlobBuilder()).isInner is true
     9PASS (new inner.BlobBuilder()).constructor.isInner is true
    810PASS (new inner.DOMParser()).isInner is true
    911PASS (new inner.DOMParser()).constructor.isInner is true

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

    r61136 r61585  
    209209PASS WebKitCSSKeyframesRulePrototype from inner.document.getElementById("dummyStyle").sheet.cssRules.6.__proto__
    210210Never found Audio
     211Never found BlobBuilder
    211212Never found Blob
    212213Never found CDATASection

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

    r61531 r61585  
    1212PASS inner.Blob.isInner is true
    1313PASS inner.Blob.constructor.isInner is true
     14PASS inner.BlobBuilder.isInner is true
     15PASS inner.BlobBuilder.constructor.isInner is true
    1416PASS inner.CDATASection.isInner is true
    1517PASS inner.CDATASection.constructor.isInner is true

  • trunk/LayoutTests/fast/js/global-constructors-expected.txt

    r61531 r61585  
    88PASS BeforeLoadEvent.toString() is '[object BeforeLoadEventConstructor]'
    99PASS Blob.toString() is '[object BlobConstructor]'
     10PASS BlobBuilder.toString() is '[object BlobBuilderConstructor]'
    1011PASS CDATASection.toString() is '[object CDATASectionConstructor]'
    1112PASS CSSCharsetRule.toString() is '[object CSSCharsetRuleConstructor]'

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

    r61531 r61585  
    1212PASS inner.Blob.isInner is true
    1313PASS inner.Blob.constructor.isInner is true
     14PASS inner.BlobBuilder.isInner is true
     15PASS inner.BlobBuilder.constructor.isInner is true
    1416PASS inner.CDATASection.isInner is true
    1517PASS inner.CDATASection.constructor.isInner is true

  • trunk/LayoutTests/platform/gtk/Skipped

    r61564 r61585  
    32933293http/tests/local/send-dragged-file.html
    32943294http/tests/local/send-sliced-dragged-file.html
     3295http/tests/local/blob/send-hybrid-blob.html
     3296http/tests/local/blob/send-sliced-data-blob.html
    32953297http/tests/local/formdata/send-form-data.html
    32963298http/tests/local/formdata/send-form-data-with-sliced-file.html

  • trunk/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt

    r61531 r61585  
    122122window.Audio.prototype.setAttributeNode [function]
    123123window.Audio.prototype.setAttributeNodeNS [function]
     124window.BlobBuilder [object BlobBuilderConstructor]
     125window.BlobBuilder.prototype [object BlobBuilderPrototype]
     126window.BlobBuilder.prototype.append [function]
     127window.BlobBuilder.prototype.getBlob [function]
    124128window.CDATASection [object CDATASectionConstructor]
    125129window.CDATASection.prototype [object CDATASectionPrototype]

  • trunk/LayoutTests/platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt

    r61532 r61585  
    99PASS typeof Object.getOwnPropertyDescriptor(window, 'BeforeLoadEvent') is 'object'
    1010PASS typeof Object.getOwnPropertyDescriptor(window, 'Blob') is 'object'
     11PASS typeof Object.getOwnPropertyDescriptor(window, 'BlobBuilder') is 'object'
    1112PASS typeof Object.getOwnPropertyDescriptor(window, 'Boolean') is 'object'
    1213PASS typeof Object.getOwnPropertyDescriptor(window, 'CDATASection') is 'object'

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

    r61531 r61585  
    1212PASS inner.Blob.isInner is true
    1313PASS inner.Blob.constructor.isInner is true
     14PASS inner.BlobBuilder.isInner is true
     15PASS inner.BlobBuilder.constructor.isInner is true
    1416PASS inner.CDATASection.isInner is true
    1517PASS inner.CDATASection.constructor.isInner is true

  • trunk/LayoutTests/platform/qt/Skipped

    r61580 r61585  
    216216http/tests/local/send-dragged-file.html
    217217http/tests/local/send-sliced-dragged-file.html
     218http/tests/local/blob/send-hybrid-blob.html
     219http/tests/local/blob/send-sliced-data-blob.html
    218220http/tests/local/formdata/send-form-data.html
    219221http/tests/local/formdata/send-form-data-with-sliced-file.html

  • trunk/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt

    r61531 r61585  
    151151window.Blob [object BlobConstructor]
    152152window.Blob.prototype [object BlobPrototype]
     153window.BlobBuilder [object BlobBuilderConstructor]
     154window.BlobBuilder.prototype [object BlobBuilderPrototype]
     155window.BlobBuilder.prototype.append [function]
     156window.BlobBuilder.prototype.getBlob [function]
    153157window.CDATASection [object CDATASectionConstructor]
    154158window.CDATASection.prototype [object CDATASectionPrototype]

  • trunk/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt

    r61531 r61585  
    99PASS typeof Object.getOwnPropertyDescriptor(window, 'BeforeLoadEvent') is 'object'
    1010PASS typeof Object.getOwnPropertyDescriptor(window, 'Blob') is 'object'
     11PASS typeof Object.getOwnPropertyDescriptor(window, 'BlobBuilder') is 'object'
    1112PASS typeof Object.getOwnPropertyDescriptor(window, 'Boolean') is 'object'
    1213PASS typeof Object.getOwnPropertyDescriptor(window, 'CDATASection') is 'object'

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

    r61531 r61585  
    1212PASS inner.Blob.isInner is true
    1313PASS inner.Blob.constructor.isInner is true
     14PASS inner.BlobBuilder.isInner is true
     15PASS inner.BlobBuilder.constructor.isInner is true
    1416PASS inner.CDATASection.isInner is true
    1517PASS inner.CDATASection.constructor.isInner is true

  • trunk/LayoutTests/platform/win/Skipped

    r61564 r61585  
    681681http/tests/local/send-dragged-file.html
    682682http/tests/local/send-sliced-dragged-file.html
     683http/tests/local/blob/send-hybrid-blob.html
    683684http/tests/local/formdata/send-form-data.html
    684685http/tests/local/formdata/send-form-data-with-sliced-file.html
    685686http/tests/local/formdata/upload-events.html
     687
     688# Need Blob.slice support
     689http/tests/local/blob/send-sliced-data-blob.html
    686690
    687691# <https://bugs.webkit.org/show_bug.cgi?id=29289>

  • trunk/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt

    r61531 r61585  
    99PASS typeof Object.getOwnPropertyDescriptor(window, 'BeforeLoadEvent') is 'object'
    1010PASS typeof Object.getOwnPropertyDescriptor(window, 'Blob') is 'object'
     11PASS typeof Object.getOwnPropertyDescriptor(window, 'BlobBuilder') is 'object'
    1112PASS typeof Object.getOwnPropertyDescriptor(window, 'Boolean') is 'object'
    1213PASS typeof Object.getOwnPropertyDescriptor(window, 'CDATASection') is 'object'

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

    r61261 r61585  
    210210Never found Audio
    211211Never found Blob
     212Never found BlobBuilder
    212213Never found CDATASection
    213214Never found CSSRule

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

    r61570 r61585  
    1212PASS inner.Blob.isInner is true
    1313PASS inner.Blob.constructor.isInner is true
     14PASS inner.BlobBuilder.isInner is true
     15PASS inner.BlobBuilder.constructor.isInner is true
    1416PASS inner.CDATASection.isInner is true
    1517PASS inner.CDATASection.constructor.isInner is true

  • trunk/WebCore/Android.derived.jscbindings.mk

    r61531 r61585  
    156156GEN := \
    157157    $(intermediates)/html/JSBlob.h \
     158    $(intermediates)/html/JSBlobBuilder.h \
    158159    $(intermediates)/html/JSDOMFormData.h \
    159160    $(intermediates)/html/JSDataGridColumn.h \

  • trunk/WebCore/Android.derived.v8bindings.mk

    r61531 r61585  
    139139GEN := \
    140140    $(intermediates)/bindings/V8Blob.h \
     141    $(intermediates)/bindings/V8BlobBuilder.h \
    141142    $(intermediates)/bindings/V8DataGridColumn.h \
    142143    $(intermediates)/bindings/V8DataGridColumnList.h \

  • trunk/WebCore/CMakeLists.txt

    r61584 r61585  
    183183
    184184    html/Blob.idl
     185    html/BlobBuilder.idl
    185186    html/DataGridColumn.idl
    186187    html/DataGridColumnList.idl

  • trunk/WebCore/ChangeLog

    r61584 r61585  
     12010-06-21  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Add BlobBuilder.idl to expose BlobBuilder interface
     6        https://bugs.webkit.org/show_bug.cgi?id=40593
     7
     8        BlobBuilder is defined in FileAPI's FileWriter spec.
     9        (http://dev.w3.org/2009/dap/file-system/file-writer.html)
     10
     11        Also removes the ENABLE_FILE_WRITER ifdef guard for BlobBuilder.
     12
     13        Tests: http/tests/local/blob/send-data-blob.html
     14               http/tests/local/blob/send-hybrid-blob.html
     15               http/tests/local/blob/send-sliced-data-blob.html
     16
     17        * Android.derived.jscbindings.mk:
     18        * Android.derived.v8bindings.mk:
     19        * CMakeLists.txt:
     20        * DerivedSources.cpp:
     21        * DerivedSources.make:
     22        * GNUmakefile.am:
     23        * WebCore.gypi:
     24        * WebCore.pri:
     25        * WebCore.pro:
     26        * WebCore.vcproj/WebCore.vcproj:
     27        * WebCore.xcodeproj/project.pbxproj:
     28        * html/BlobBuilder.cpp:
     29        (WebCore::BlobBuilder::append):
     30        * html/BlobBuilder.h:
     31        * html/BlobBuilder.idl: Added.
     32        * page/DOMWindow.idl:
     33
    1342010-06-21  Nate Chapin  <japhet@chromium.org>
    235

  • trunk/WebCore/DerivedSources.cpp

    r61531 r61585  
    3131#include "JSBeforeLoadEvent.cpp"
    3232#include "JSBlob.cpp"
     33#include "JSBlobBuilder.cpp"
    3334#include "JSCanvasGradient.cpp"
    3435#include "JSCanvasPattern.cpp"

  • trunk/WebCore/DerivedSources.make

    r61531 r61585  
    5555    BeforeLoadEvent \
    5656    Blob \
     57    BlobBuilder \
    5758    CDATASection \
    5859    CSSCharsetRule \

  • trunk/WebCore/GNUmakefile.am

    r61584 r61585  
    181181        WebCore/dom/WheelEvent.idl \
    182182        WebCore/html/Blob.idl \
     183        WebCore/html/BlobBuilder.idl \
    183184        WebCore/html/canvas/ArrayBufferView.idl \
    184185        WebCore/html/canvas/ArrayBuffer.idl \

  • trunk/WebCore/WebCore.gypi

    r61584 r61585  
    8484            'dom/WheelEvent.idl',
    8585            'html/Blob.idl',
     86            'html/BlobBuilder.idl',
    8687            'html/canvas/WebGLActiveInfo.idl',
    8788            'html/canvas/ArrayBufferView.idl',

  • trunk/WebCore/WebCore.pri

    r61545 r61585  
    321321    dom/WheelEvent.idl \
    322322    html/Blob.idl \
     323    html/BlobBuilder.idl \
    323324    html/canvas/ArrayBufferView.idl \
    324325    html/canvas/ArrayBuffer.idl \

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

    r61584 r61585  
    778778                        </File>
    779779                        <File
     780                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSBlobBuilder.cpp"
     781                                >
     782                        </File>
     783                        <File
     784                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSBlobBuilder.h"
     785                                >
     786                        </File>
     787                        <File
    780788                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSCanvasGradient.cpp"
    781789                                >

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

    r61584 r61585  
    22782278                89BED5EB11BE11CE00448492 /* BlobBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89BED5E911BE11CE00448492 /* BlobBuilder.cpp */; };
    22792279                89BED5EC11BE11CE00448492 /* BlobBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 89BED5EA11BE11CE00448492 /* BlobBuilder.h */; };
     2280                89CD029311C85B870070B791 /* JSBlobBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89CD029111C85B870070B791 /* JSBlobBuilder.cpp */; };
     2281                89CD029411C85B870070B791 /* JSBlobBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 89CD029211C85B870070B791 /* JSBlobBuilder.h */; };
    22802282                8FAC774D119872CB0015AE94 /* JSMainThreadExecState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */; };
    22812283                9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */; };
    … …  
    78987900                89BED5E911BE11CE00448492 /* BlobBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlobBuilder.cpp; sourceTree = "<group>"; };
    78997901                89BED5EA11BE11CE00448492 /* BlobBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobBuilder.h; sourceTree = "<group>"; };
     7902                89CD027911C859A80070B791 /* BlobBuilder.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BlobBuilder.idl; sourceTree = "<group>"; };
     7903                89CD029111C85B870070B791 /* JSBlobBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBlobBuilder.cpp; sourceTree = "<group>"; };
     7904                89CD029211C85B870070B791 /* JSBlobBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBlobBuilder.h; sourceTree = "<group>"; };
    79007905                8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMainThreadExecState.h; sourceTree = "<group>"; };
    79017906                8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMainThreadExecState.cpp; sourceTree = "<group>"; };
    … …  
    1342413429                                89BED5E911BE11CE00448492 /* BlobBuilder.cpp */,
    1342513430                                89BED5EA11BE11CE00448492 /* BlobBuilder.h */,
     13431                                89CD027911C859A80070B791 /* BlobBuilder.idl */,
    1342613432                                93C441ED0F813A1A00C1A634 /* CollectionCache.cpp */,
    1342713433                                93C441EE0F813A1A00C1A634 /* CollectionCache.h */,
    … …  
    1380913815                                2E2D99CB10E2BBDA00496337 /* JSBlob.cpp */,
    1381013816                                2E2D99CC10E2BBDA00496337 /* JSBlob.h */,
     13817                                89CD029111C85B870070B791 /* JSBlobBuilder.cpp */,
     13818                                89CD029211C85B870070B791 /* JSBlobBuilder.h */,
    1381113819                                65DF323309D1DE65000BE325 /* JSCanvasGradient.cpp */,
    1381213820                                65DF323409D1DE65000BE325 /* JSCanvasGradient.h */,
    … …  
    1823218240                                BC946348107A936600857193 /* JSBeforeLoadEvent.h in Headers */,
    1823318241                                2E2D99CE10E2BBDA00496337 /* JSBlob.h in Headers */,
     18242                                89CD029411C85B870070B791 /* JSBlobBuilder.h in Headers */,
    1823418243                                1449E24C107D4A8400B5793F /* JSCallbackData.h in Headers */,
    1823518244                                65DF323A09D1DE65000BE325 /* JSCanvasGradient.h in Headers */,
    … …  
    2055920568                                BC946346107A934B00857193 /* JSBeforeLoadEvent.cpp in Sources */,
    2056020569                                2E2D99CD10E2BBDA00496337 /* JSBlob.cpp in Sources */,
     20570                                89CD029311C85B870070B791 /* JSBlobBuilder.cpp in Sources */,
    2056120571                                1449E287107D4DB400B5793F /* JSCallbackData.cpp in Sources */,
    2056220572                                65DF323909D1DE65000BE325 /* JSCanvasGradient.cpp in Sources */,

  • trunk/WebCore/html/BlobBuilder.cpp

    r61225 r61585  
    3131#include "config.h"
    3232
    33 #if ENABLE(FILE_WRITER)
    34 
    3533#include "BlobBuilder.h"
    3634
    … …  
    5856}
    5957
    60 bool BlobBuilder::appendString(const String& text, const String& type, ExceptionCode& ec)
     58bool BlobBuilder::append(const String& text, const String& type, ExceptionCode& ec)
    6159{
    6260    ec = 0;
    … …  
    7068}
    7169
    72 bool BlobBuilder::appendBlob(PassRefPtr<Blob> blob)
     70bool BlobBuilder::append(const String& text, ExceptionCode& ec)
     71{
     72    return append(text, String(), ec);
     73}
     74
     75bool BlobBuilder::append(PassRefPtr<Blob> blob)
    7376{
    7477    if (blob) {
    … …  
    8689
    8790} // namespace WebCore
    88 
    89 #endif // ENABLE(FILE_WRITER)

  • trunk/WebCore/html/BlobBuilder.h

    r61225 r61585  
    3232#define BlobBuilder_h
    3333
    34 #if ENABLE(FILE_WRITER)
    35 
    3634#include "BlobItem.h"
    3735#include <wtf/PassRefPtr.h>
    … …  
    4846    static PassRefPtr<BlobBuilder> create() { return adoptRef(new BlobBuilder()); }
    4947
    50     bool appendString(const String& text, const String& ending, ExceptionCode&);
    51     bool appendBlob(PassRefPtr<Blob>);
     48    bool append(PassRefPtr<Blob>);
     49    bool append(const String& text, ExceptionCode&);
     50    bool append(const String& text, const String& ending, ExceptionCode&);
    5251
    53     PassRefPtr<Blob> getBlob(const String& contentType) const;
     52    PassRefPtr<Blob> getBlob(const String& contentType = String()) const;
    5453
    5554private:
    … …  
    5958} // namespace WebCore
    6059
    61 
    62 #endif // ENABLE(FILE_WRITER)
    63 
    6460#endif // BlobBuilder_h

  • trunk/WebCore/page/DOMWindow.idl

    r61531 r61585  
    741741        attribute [Conditional=FILE_READER] FileReaderConstructor FileReader;
    742742
     743        attribute BlobBuilderConstructor BlobBuilder;
     744
    743745#endif // defined(LANGUAGE_JAVASCRIPT)
    744746
Note: See TracChangeset for help on using the changeset viewer.