Changeset 80536 in webkit
- Timestamp:
- Mar 7, 2011 9:48:33 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 14 added
- 28 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r80534 r80536 1 2011-03-07 Daniel Cheng <dcheng@chromium.org> 2 3 Reviewed by David Levin. 4 5 Add support for DataTransferItems 6 https://bugs.webkit.org/show_bug.cgi?id=55115 7 8 Layout test to verify that the basic properties of dataTransfer.items function as expected. 9 10 * editing/pasteboard/data-transfer-items-expected.txt: Added. 11 * editing/pasteboard/data-transfer-items.html: Added. 12 * platform/gtk/Skipped: 13 * platform/mac/Skipped: 14 * platform/qt/Skipped: 15 * platform/win/Skipped: 16 1 17 2011-03-07 Victoria Kirst <vrk@google.com> 2 18 -
trunk/LayoutTests/platform/gtk/Skipped
r80492 r80536 1313 1313 # https://bugs.webkit.org/show_bug.cgi?id=55862 1314 1314 fast/forms/onchange-setvalueforuser.html 1315 1316 # DataTransferItems is not yet implemented. 1317 editing/pasteboard/data-transfer-items.html -
trunk/LayoutTests/platform/mac/Skipped
r80509 r80536 303 303 # https://bugs.webkit.org/show_bug.cgi?id=55509 304 304 compositing/webgl/webgl-nonpremultiplied-blend.html 305 306 # DataTransferItems is not yet implemented. 307 editing/pasteboard/data-transfer-items.html -
trunk/LayoutTests/platform/qt/Skipped
r80531 r80536 108 108 # This port doesn't support v8 i18n extension. 109 109 fast/js/i18n-bindings-locale.html 110 111 # DataTransferItems is not yet implemented. 112 editing/pasteboard/data-transfer-items.html 110 113 111 114 # =========================================================================== # -
trunk/LayoutTests/platform/win/Skipped
r80531 r80536 1169 1169 # Windows port doesn't support HTML in pastes. 1170 1170 editing/pasteboard/onpaste-text-html-types.html 1171 1172 # DataTransferItems is not yet implemented. 1173 editing/pasteboard/data-transfer-items.html -
trunk/Source/WebCore/Android.mk
r80463 r80536 115 115 dom/DOMImplementation.cpp \ 116 116 dom/DOMStringList.cpp \ 117 dom/DataTransferItem.cpp \ 117 118 dom/DecodedDataDocumentParser.cpp \ 118 119 dom/DeviceMotionController.cpp \ … … 177 178 dom/StaticHashSetNodeList.cpp \ 178 179 dom/StaticNodeList.cpp \ 180 dom/StringCallback.cpp \ 179 181 dom/StyleElement.cpp \ 180 182 dom/StyledElement.cpp \ -
trunk/Source/WebCore/CMakeLists.txt
r80463 r80536 1571 1571 platform/sql/SQLiteStatement.cpp 1572 1572 platform/sql/SQLiteTransaction.cpp 1573 ) 1574 ENDIF () 1575 1576 IF (ENABLE_DATA_TRANSFER_ITEMS) 1577 LIST(APPEND WebCore_IDL_FILES 1578 dom/DataTransferItem.idl 1579 dom/DataTransferItems.idl 1580 dom/StringCallback.idl 1581 ) 1582 LIST(APPEND WebCore_SOURCES 1583 dom/DataTransferItem.cpp 1584 dom/StringCallback.cpp 1573 1585 ) 1574 1586 ENDIF () -
trunk/Source/WebCore/ChangeLog
r80528 r80536 1 2011-03-07 Daniel Cheng <dcheng@chromium.org> 2 3 Reviewed by David Levin. 4 5 Add support for DataTransferItems 6 https://bugs.webkit.org/show_bug.cgi?id=55115 7 8 This patch adds stubs for DataTransferItems/DataTransferItem as well as implementing the 9 basic functionality on the Chromium port. With the exception of DataTransferItem::getAsFile, 10 all functionality on the DataTransferItems collection has been implemented. 11 This change does not actually hook up DataTransferItems to reflect the actual contents of a 12 drop/paste operation or to allow mutation of data in a copy/drag start yet. That will be 13 enabled via several followup patches. 14 15 Test: editing/pasteboard/data-transfer-items.html 16 17 * Android.mk: 18 * CMakeLists.txt: 19 * CodeGenerators.pri: 20 * DerivedSources.cpp: 21 * DerivedSources.make: 22 * GNUmakefile.am: 23 * WebCore.gypi: 24 * WebCore.pro: 25 * WebCore.vcproj/WebCore.vcproj: 26 * WebCore.xcodeproj/project.pbxproj: 27 * bindings/generic/RuntimeEnabledFeatures.cpp: 28 * bindings/generic/RuntimeEnabledFeatures.h: 29 (WebCore::RuntimeEnabledFeatures::setDataTransferItemsEnabled): 30 (WebCore::RuntimeEnabledFeatures::dataTransferItemsEnabled): 31 * bindings/scripts/CodeGeneratorV8.pm: Do not emit an #include line for DOMString, since it's built-in. 32 * dom/Clipboard.h: 33 (WebCore::Clipboard::policy): 34 * dom/Clipboard.idl: 35 * dom/DataTransferItem.cpp: Added. 36 * dom/DataTransferItem.h: Added. 37 (WebCore::DataTransferItem::~DataTransferItem): 38 * dom/DataTransferItem.idl: Added. 39 * dom/DataTransferItems.h: Added. 40 (WebCore::DataTransferItems::~DataTransferItems): 41 * dom/DataTransferItems.idl: Added. 42 * dom/StringCallback.cpp: Added. 43 (WebCore::StringCallback::scheduleCallback): 44 * dom/StringCallback.h: Added. 45 (WebCore::StringCallback::~StringCallback): 46 * dom/StringCallback.idl: Added. 47 * platform/chromium/ClipboardChromium.cpp: 48 (WebCore::ClipboardChromium::items): 49 * platform/chromium/ClipboardChromium.h: 50 * platform/chromium/DataTransferItemChromium.cpp: Added. 51 (WebCore::DataTransferItemChromium::create): 52 (WebCore::DataTransferItemChromium::DataTransferItemChromium): 53 (WebCore::DataTransferItemChromium::kind): 54 (WebCore::DataTransferItemChromium::type): 55 (WebCore::DataTransferItemChromium::getAsString): 56 * platform/chromium/DataTransferItemChromium.h: Added. 57 * platform/chromium/DataTransferItemsChromium.cpp: Added. 58 (WebCore::DataTransferItemsChromium::create): 59 (WebCore::DataTransferItemsChromium::DataTransferItemsChromium): 60 (WebCore::DataTransferItemsChromium::length): 61 (WebCore::DataTransferItemsChromium::item): 62 (WebCore::DataTransferItemsChromium::deleteItem): 63 (WebCore::DataTransferItemsChromium::clear): 64 (WebCore::DataTransferItemsChromium::add): 65 * platform/chromium/DataTransferItemsChromium.h: Added. 66 1 67 2011-03-07 Ryosuke Niwa <rniwa@webkit.org> 2 68 -
trunk/Source/WebCore/CodeGenerators.pri
r79011 r80536 110 110 dom/CompositionEvent.idl \ 111 111 dom/CustomEvent.idl \ 112 dom/DataTransferItem.idl \ 113 dom/DataTransferItems.idl \ 112 114 dom/DeviceMotionEvent.idl \ 113 115 dom/DeviceOrientationEvent.idl \ … … 147 149 dom/RangeException.idl \ 148 150 dom/Range.idl \ 151 dom/StringCallback.idl \ 149 152 dom/Text.idl \ 150 153 dom/TextEvent.idl \ -
trunk/Source/WebCore/DerivedSources.cpp
r78525 r80536 73 73 #include "JSDataGridColumn.cpp" 74 74 #include "JSDataGridColumnList.cpp" 75 #include "JSDataTransferItem.cpp" 76 #include "JSDataTransferItems.cpp" 75 77 #include "JSDataView.cpp" 76 78 #include "JSDedicatedWorkerContext.cpp" … … 282 284 #include "JSStorage.cpp" 283 285 #include "JSStorageEvent.cpp" 286 #include "JSStringCallback.cpp" 284 287 #include "JSStyleMedia.cpp" 285 288 #include "JSStyleSheet.cpp" -
trunk/Source/WebCore/DerivedSources.make
r80418 r80536 151 151 DOMURL \ 152 152 DOMWindow \ 153 DataTransferItem \ 154 DataTransferItems \ 153 155 Database \ 154 156 DatabaseCallback \ … … 348 350 Storage \ 349 351 StorageEvent \ 352 StringCallback \ 350 353 SVGAElement \ 351 354 SVGAltGlyphElement \ -
trunk/Source/WebCore/GNUmakefile.am
r80476 r80536 4017 4017 # ---- 4018 4018 # HTML5 data transfer items support 4019 # -----4019 # ---- 4020 4020 if ENABLE_DATA_TRANSFER_ITEMS 4021 4021 FEATURE_DEFINES += ENABLE_DATA_TRANSFER_ITEMS=1 4022 4022 webcore_cppflags += -DENABLE_DATA_TRANSFER_ITEMS=1 4023 webcore_built_sources += \ 4024 DerivedSources/WebCore/JSDataTransferItem.cpp \ 4025 DerivedSources/WebCore/JSDataTransferItem.h \ 4026 DerivedSources/WebCore/JSDataTransferItems.cpp \ 4027 DerivedSources/WebCore/JSDataTransferItems.h \ 4028 DerivedSources/WebCore/JSStringCallback.cpp \ 4029 DerivedSources/WebCore/JSStringCallback.h 4030 webcore_sources += \ 4031 Source/WebCore/dom/DataTransferItem.cpp \ 4032 Source/WebCore/dom/DataTransferItem.h \ 4033 Source/WebCore/dom/DataTransferItems.h \ 4034 Source/WebCore/dom/StringCallback.cpp \ 4035 Source/WebCore/dom/StringCallback.h 4023 4036 endif # END ENABLE_DATA_TRANSFER_ITEMS 4024 4037 -
trunk/Source/WebCore/WebCore.gypi
r80502 r80536 51 51 'dom/DOMStringList.idl', 52 52 'dom/DOMStringMap.idl', 53 'dom/DataTransferItem.idl', 54 'dom/DataTransferItems.idl', 53 55 'dom/DeviceMotionEvent.idl', 54 56 'dom/DeviceOrientationEvent.idl', … … 85 87 'dom/RangeException.idl', 86 88 'dom/RequestAnimationFrameCallback.idl', 89 'dom/StringCallback.idl', 87 90 'dom/Text.idl', 88 91 'dom/TextEvent.idl', … … 1342 1345 'dom/DOMStringMap.h', 1343 1346 'dom/DOMTimeStamp.h', 1347 'dom/DataTransferItem.cpp', 1348 'dom/DataTransferItem.h', 1349 'dom/DataTransferItems.h', 1344 1350 'dom/DatasetDOMStringMap.cpp', 1345 1351 'dom/DatasetDOMStringMap.h', … … 1494 1500 'dom/StaticStringList.cpp', 1495 1501 'dom/StaticStringList.h', 1502 'dom/StringCallback.cpp', 1503 'dom/StringCallback.h', 1496 1504 'dom/StyleElement.cpp', 1497 1505 'dom/StyleElement.h', … … 2809 2817 'platform/chromium/ContextMenuItemChromium.cpp', 2810 2818 'platform/chromium/CursorChromium.cpp', 2819 'platform/chromium/DataTransferItemChromium.cpp', 2820 'platform/chromium/DataTransferItemChromium.h', 2821 'platform/chromium/DataTransferItemsChromium.cpp', 2822 'platform/chromium/DataTransferItemsChromium.h', 2811 2823 'platform/chromium/DragDataChromium.cpp', 2812 2824 'platform/chromium/DragDataRef.h', -
trunk/Source/WebCore/WebCore.pro
r80463 r80536 2693 2693 } 2694 2694 2695 contains(DEFINES, ENABLE_DATA_TRANSFER_ITEMS=1) { 2696 HEADERS += \ 2697 dom/DataTransferItem.h \ 2698 dom/DataTransferItems.h \ 2699 dom/StringCallback.h 2700 SOURCES += \ 2701 dom/DataTransferItem.cpp \ 2702 dom/StringCallback.cpp 2703 } 2704 2695 2705 contains(DEFINES, ENABLE_DOM_STORAGE=1) { 2696 2706 HEADERS += \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r80463 r80536 2819 2819 </File> 2820 2820 <File 2821 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSDataTransferItem.cpp" 2822 > 2823 <FileConfiguration 2824 Name="Debug|Win32" 2825 ExcludedFromBuild="true" 2826 > 2827 <Tool 2828 Name="VCCLCompilerTool" 2829 /> 2830 </FileConfiguration> 2831 <FileConfiguration 2832 Name="Release|Win32" 2833 ExcludedFromBuild="true" 2834 > 2835 <Tool 2836 Name="VCCLCompilerTool" 2837 /> 2838 </FileConfiguration> 2839 <FileConfiguration 2840 Name="Debug_Cairo_CFLite|Win32" 2841 ExcludedFromBuild="true" 2842 > 2843 <Tool 2844 Name="VCCLCompilerTool" 2845 /> 2846 </FileConfiguration> 2847 <FileConfiguration 2848 Name="Release_Cairo_CFLite|Win32" 2849 ExcludedFromBuild="true" 2850 > 2851 <Tool 2852 Name="VCCLCompilerTool" 2853 /> 2854 </FileConfiguration> 2855 <FileConfiguration 2856 Name="Debug_All|Win32" 2857 ExcludedFromBuild="true" 2858 > 2859 <Tool 2860 Name="VCCLCompilerTool" 2861 /> 2862 </FileConfiguration> 2863 <FileConfiguration 2864 Name="Release_LTCG|Win32" 2865 ExcludedFromBuild="true" 2866 > 2867 <Tool 2868 Name="VCCLCompilerTool" 2869 /> 2870 </FileConfiguration> 2871 </File> 2872 <File 2873 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSDataTransferItem.h" 2874 > 2875 </File> 2876 <File 2877 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSDataTransferItems.cpp" 2878 > 2879 <FileConfiguration 2880 Name="Debug|Win32" 2881 ExcludedFromBuild="true" 2882 > 2883 <Tool 2884 Name="VCCLCompilerTool" 2885 /> 2886 </FileConfiguration> 2887 <FileConfiguration 2888 Name="Release|Win32" 2889 ExcludedFromBuild="true" 2890 > 2891 <Tool 2892 Name="VCCLCompilerTool" 2893 /> 2894 </FileConfiguration> 2895 <FileConfiguration 2896 Name="Debug_Cairo_CFLite|Win32" 2897 ExcludedFromBuild="true" 2898 > 2899 <Tool 2900 Name="VCCLCompilerTool" 2901 /> 2902 </FileConfiguration> 2903 <FileConfiguration 2904 Name="Release_Cairo_CFLite|Win32" 2905 ExcludedFromBuild="true" 2906 > 2907 <Tool 2908 Name="VCCLCompilerTool" 2909 /> 2910 </FileConfiguration> 2911 <FileConfiguration 2912 Name="Debug_All|Win32" 2913 ExcludedFromBuild="true" 2914 > 2915 <Tool 2916 Name="VCCLCompilerTool" 2917 /> 2918 </FileConfiguration> 2919 <FileConfiguration 2920 Name="Release_LTCG|Win32" 2921 ExcludedFromBuild="true" 2922 > 2923 <Tool 2924 Name="VCCLCompilerTool" 2925 /> 2926 </FileConfiguration> 2927 </File> 2928 <File 2929 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSDataTransferItems.h" 2930 > 2931 </File> 2932 <File 2821 2933 RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSDedicatedWorkerContext.cpp" 2822 2934 > … … 21124 21236 <File 21125 21237 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGZoomEvent.h" 21238 > 21239 </File> 21240 <File 21241 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStringCallback.cpp" 21242 > 21243 <FileConfiguration 21244 Name="Debug|Win32" 21245 ExcludedFromBuild="true" 21246 > 21247 <Tool 21248 Name="VCCLCompilerTool" 21249 /> 21250 </FileConfiguration> 21251 <FileConfiguration 21252 Name="Release|Win32" 21253 ExcludedFromBuild="true" 21254 > 21255 <Tool 21256 Name="VCCLCompilerTool" 21257 /> 21258 </FileConfiguration> 21259 <FileConfiguration 21260 Name="Debug_Cairo_CFLite|Win32" 21261 ExcludedFromBuild="true" 21262 > 21263 <Tool 21264 Name="VCCLCompilerTool" 21265 /> 21266 </FileConfiguration> 21267 <FileConfiguration 21268 Name="Release_Cairo_CFLite|Win32" 21269 ExcludedFromBuild="true" 21270 > 21271 <Tool 21272 Name="VCCLCompilerTool" 21273 /> 21274 </FileConfiguration> 21275 <FileConfiguration 21276 Name="Debug_All|Win32" 21277 ExcludedFromBuild="true" 21278 > 21279 <Tool 21280 Name="VCCLCompilerTool" 21281 /> 21282 </FileConfiguration> 21283 <FileConfiguration 21284 Name="Release_LTCG|Win32" 21285 ExcludedFromBuild="true" 21286 > 21287 <Tool 21288 Name="VCCLCompilerTool" 21289 /> 21290 </FileConfiguration> 21291 </File> 21292 <File 21293 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStringCallback.h" 21126 21294 > 21127 21295 </File> … … 42503 42671 </File> 42504 42672 <File 42673 RelativePath="..\dom\DataTransferItem.cpp" 42674 > 42675 <FileConfiguration 42676 Name="Debug|Win32" 42677 ExcludedFromBuild="true" 42678 > 42679 <Tool 42680 Name="VCCLCompilerTool" 42681 /> 42682 </FileConfiguration> 42683 <FileConfiguration 42684 Name="Release|Win32" 42685 ExcludedFromBuild="true" 42686 > 42687 <Tool 42688 Name="VCCLCompilerTool" 42689 /> 42690 </FileConfiguration> 42691 <FileConfiguration 42692 Name="Debug_Cairo_CFLite|Win32" 42693 ExcludedFromBuild="true" 42694 > 42695 <Tool 42696 Name="VCCLCompilerTool" 42697 /> 42698 </FileConfiguration> 42699 <FileConfiguration 42700 Name="Release_Cairo_CFLite|Win32" 42701 ExcludedFromBuild="true" 42702 > 42703 <Tool 42704 Name="VCCLCompilerTool" 42705 /> 42706 </FileConfiguration> 42707 <FileConfiguration 42708 Name="Debug_All|Win32" 42709 ExcludedFromBuild="true" 42710 > 42711 <Tool 42712 Name="VCCLCompilerTool" 42713 /> 42714 </FileConfiguration> 42715 <FileConfiguration 42716 Name="Release_LTCG|Win32" 42717 ExcludedFromBuild="true" 42718 > 42719 <Tool 42720 Name="VCCLCompilerTool" 42721 /> 42722 </FileConfiguration> 42723 </File> 42724 <File 42725 RelativePath="..\dom\DataTransferItem.h" 42726 > 42727 </File> 42728 <File 42729 RelativePath="..\dom\DataTransferItems.h" 42730 > 42731 </File> 42732 <File 42505 42733 RelativePath="..\dom\DatasetDOMStringMap.cpp" 42506 42734 > … … 46192 46420 <File 46193 46421 RelativePath="..\dom\StaticNodeList.h" 46422 > 46423 </File> 46424 <File 46425 RelativePath="..\dom\StringCallback.cpp" 46426 > 46427 <FileConfiguration 46428 Name="Debug|Win32" 46429 ExcludedFromBuild="true" 46430 > 46431 <Tool 46432 Name="VCCLCompilerTool" 46433 /> 46434 </FileConfiguration> 46435 <FileConfiguration 46436 Name="Release|Win32" 46437 ExcludedFromBuild="true" 46438 > 46439 <Tool 46440 Name="VCCLCompilerTool" 46441 /> 46442 </FileConfiguration> 46443 <FileConfiguration 46444 Name="Debug_Cairo_CFLite|Win32" 46445 ExcludedFromBuild="true" 46446 > 46447 <Tool 46448 Name="VCCLCompilerTool" 46449 /> 46450 </FileConfiguration> 46451 <FileConfiguration 46452 Name="Release_Cairo_CFLite|Win32" 46453 ExcludedFromBuild="true" 46454 > 46455 <Tool 46456 Name="VCCLCompilerTool" 46457 /> 46458 </FileConfiguration> 46459 <FileConfiguration 46460 Name="Debug_All|Win32" 46461 ExcludedFromBuild="true" 46462 > 46463 <Tool 46464 Name="VCCLCompilerTool" 46465 /> 46466 </FileConfiguration> 46467 <FileConfiguration 46468 Name="Release_LTCG|Win32" 46469 ExcludedFromBuild="true" 46470 > 46471 <Tool 46472 Name="VCCLCompilerTool" 46473 /> 46474 </FileConfiguration> 46475 </File> 46476 <File 46477 RelativePath="..\dom\StringCallback.h" 46194 46478 > 46195 46479 </File> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r80510 r80536 1662 1662 7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */; }; 1663 1663 7EE6847512D26E7000E79415 /* ResourceLoaderCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */; }; 1664 8102C5881325BB1100DDE67A /* StringCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8102C5871325BB1100DDE67A /* StringCallback.cpp */; }; 1665 815E6167132587AA00B622B0 /* DataTransferItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 815E6166132587AA00B622B0 /* DataTransferItem.cpp */; }; 1664 1666 81A7325E1210189B00FC0D9E /* IDBCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A7325D1210189B00FC0D9E /* IDBCursor.h */; }; 1665 1667 81A73260121018A400FC0D9E /* IDBCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81A7325F121018A400FC0D9E /* IDBCursor.cpp */; }; 1666 1668 81A73278121019E100FC0D9E /* IDBCursorBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 81A73277121019E100FC0D9E /* IDBCursorBackendImpl.h */; }; 1669 81AC5999131636E60009A7E0 /* DataTransferItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 81AC5997131636E60009A7E0 /* DataTransferItem.h */; }; 1670 81AC599A131636E60009A7E0 /* DataTransferItems.h in Headers */ = {isa = PBXBuildFile; fileRef = 81AC5998131636E60009A7E0 /* DataTransferItems.h */; }; 1671 81AC6C36131C57D30009A7E0 /* StringCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 81AC6C35131C57D30009A7E0 /* StringCallback.h */; }; 1667 1672 81BE209811F4AB8D00915DFA /* IDBCursorBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81BE209311F4AB8D00915DFA /* IDBCursorBackendImpl.cpp */; }; 1668 1673 81BE209911F4AB8D00915DFA /* IDBCursorBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BE209411F4AB8D00915DFA /* IDBCursorBackendInterface.h */; }; … … 8156 8161 7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceResponseCFNet.cpp; sourceTree = "<group>"; }; 8157 8162 7EE6847412D26E7000E79415 /* ResourceLoaderCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ResourceLoaderCFNet.cpp; path = cf/ResourceLoaderCFNet.cpp; sourceTree = "<group>"; }; 8163 8102C5871325BB1100DDE67A /* StringCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringCallback.cpp; sourceTree = "<group>"; }; 8164 815E6166132587AA00B622B0 /* DataTransferItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DataTransferItem.cpp; sourceTree = "<group>"; }; 8158 8165 81A7325D1210189B00FC0D9E /* IDBCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursor.h; sourceTree = "<group>"; }; 8159 8166 81A7325F121018A400FC0D9E /* IDBCursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBCursor.cpp; sourceTree = "<group>"; }; 8160 8167 81A73277121019E100FC0D9E /* IDBCursorBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursorBackendImpl.h; sourceTree = "<group>"; }; 8168 81AC5997131636E60009A7E0 /* DataTransferItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataTransferItem.h; sourceTree = "<group>"; }; 8169 81AC5998131636E60009A7E0 /* DataTransferItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataTransferItems.h; sourceTree = "<group>"; }; 8170 81AC5AE81316392E0009A7E0 /* DataTransferItem.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DataTransferItem.idl; sourceTree = "<group>"; }; 8171 81AC5AE91316392E0009A7E0 /* DataTransferItems.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DataTransferItems.idl; sourceTree = "<group>"; }; 8172 81AC6C34131C57C20009A7E0 /* StringCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = StringCallback.idl; sourceTree = "<group>"; }; 8173 81AC6C35131C57D30009A7E0 /* StringCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringCallback.h; sourceTree = "<group>"; }; 8161 8174 81BE209311F4AB8D00915DFA /* IDBCursorBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBCursorBackendImpl.cpp; sourceTree = "<group>"; }; 8162 8175 81BE209411F4AB8D00915DFA /* IDBCursorBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursorBackendInterface.h; sourceTree = "<group>"; }; … … 19022 19035 62CD32571157E57C0063B0A7 /* CustomEvent.h */, 19023 19036 62CD32581157E57C0063B0A7 /* CustomEvent.idl */, 19037 815E6166132587AA00B622B0 /* DataTransferItem.cpp */, 19038 81AC5997131636E60009A7E0 /* DataTransferItem.h */, 19039 81AC5998131636E60009A7E0 /* DataTransferItems.h */, 19040 81AC5AE81316392E0009A7E0 /* DataTransferItem.idl */, 19041 81AC5AE91316392E0009A7E0 /* DataTransferItems.idl */, 19024 19042 BC64641B11D7F416006455B0 /* DatasetDOMStringMap.cpp */, 19025 19043 BC64641A11D7F416006455B0 /* DatasetDOMStringMap.h */, … … 19216 19234 BC7FA62C0D1F0EFF00DB22A9 /* StaticNodeList.cpp */, 19217 19235 BC7FA62B0D1F0EFF00DB22A9 /* StaticNodeList.h */, 19236 8102C5871325BB1100DDE67A /* StringCallback.cpp */, 19237 81AC6C35131C57D30009A7E0 /* StringCallback.h */, 19238 81AC6C34131C57C20009A7E0 /* StringCallback.idl */, 19218 19239 A8C4A7EC09D563270003AC8D /* StyledElement.cpp */, 19219 19240 A8C4A7EB09D563270003AC8D /* StyledElement.h */, … … 19794 19815 62CD325A1157E57C0063B0A7 /* CustomEvent.h in Headers */, 19795 19816 A8CB413E0E8633FD0032C4F0 /* DashArray.h in Headers */, 19817 81AC5999131636E60009A7E0 /* DataTransferItem.h in Headers */, 19818 81AC599A131636E60009A7E0 /* DataTransferItems.h in Headers */, 19796 19819 A80E6D0B0A1989CA007FB8C5 /* DashboardRegion.h in Headers */, 19797 19820 5196116B0CAC56570010A80C /* Database.h in Headers */, … … 22076 22099 97C078501165D5BE003A32EF /* SuffixTree.h in Headers */, 22077 22100 62C1217D11AB9E77003C462C /* SuspendableTimer.h in Headers */, 22101 81AC6C36131C57D30009A7E0 /* StringCallback.h in Headers */, 22078 22102 B22279740D00BF220071B782 /* SVGAElement.h in Headers */, 22079 22103 65653F2E0D9727D200CA9723 /* SVGAltGlyphElement.h in Headers */, … … 25197 25221 598D77DD132541EE00761B22 /* JavaArrayJSC.cpp in Sources */, 25198 25222 598D77E11325420400761B22 /* JavaFieldJSC.cpp in Sources */, 25223 815E6167132587AA00B622B0 /* DataTransferItem.cpp in Sources */, 25224 8102C5881325BB1100DDE67A /* StringCallback.cpp in Sources */, 25199 25225 ); 25200 25226 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
r78095 r80536 47 47 bool RuntimeEnabledFeatures::isWebkitNotificationsEnabled = false; 48 48 bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true; 49 bool RuntimeEnabledFeatures::isDataTransferItemsEnabled = true; 49 50 bool RuntimeEnabledFeatures::isGeolocationEnabled = true; 50 51 bool RuntimeEnabledFeatures::isIndexedDBEnabled = false; -
trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
r78525 r80536 52 52 static bool applicationCacheEnabled() { return isApplicationCacheEnabled; } 53 53 54 static void setDataTransferItemsEnabled(bool isEnabled) { isDataTransferItemsEnabled = isEnabled; } 55 static bool dataTransferItemsEnabled() { return isDataTransferItemsEnabled; } 56 54 57 static void setGeolocationEnabled(bool isEnabled) { isGeolocationEnabled = isEnabled; } 55 58 static bool geolocationEnabled() { return isGeolocationEnabled; } … … 171 174 static bool isWebkitNotificationsEnabled; 172 175 static bool isApplicationCacheEnabled; 176 static bool isDataTransferItemsEnabled; 173 177 static bool isGeolocationEnabled; 174 178 static bool isIndexedDBEnabled; -
trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm
r80072 r80536 129 129 # When we're finished with the one-file-per-class 130 130 # reorganization, we won't need these special cases. 131 if (!$codeGenerator->IsPrimitiveType($type) and !$codeGenerator-> AvoidInclusionOfType($type) and $type ne "Date") {131 if (!$codeGenerator->IsPrimitiveType($type) and !$codeGenerator->IsStringType($type) and !$codeGenerator->AvoidInclusionOfType($type) and $type ne "Date") { 132 132 # default, include the same named file 133 133 $implIncludes{GetV8HeaderName(${type})} = 1; -
trunk/Source/WebCore/dom/Clipboard.h
r67973 r80536 34 34 namespace WebCore { 35 35 36 class DataTransferItems; 36 37 class DragData; 37 38 class FileList; … … 85 86 86 87 void setAccessPolicy(ClipboardAccessPolicy); 88 ClipboardAccessPolicy policy() const { return m_policy; } 87 89 88 90 DragOperation sourceOperation() const; … … 92 94 93 95 void setDragHasStarted() { m_dragStarted = true; } 96 97 #if ENABLE(DATA_TRANSFER_ITEMS) 98 virtual PassRefPtr<DataTransferItems> items() = 0; 99 #endif 94 100 95 101 protected: 96 102 Clipboard(ClipboardAccessPolicy, ClipboardType); 97 103 98 ClipboardAccessPolicy policy() const { return m_policy; }99 104 bool dragStarted() const { return m_dragStarted; } 100 105 -
trunk/Source/WebCore/dom/Clipboard.idl
r59536 r80536 43 43 [Custom] void setDragImage(in HTMLImageElement image, in long x, in long y) 44 44 raises(DOMException); 45 46 readonly attribute [Conditional=DATA_TRANSFER_ITEMS, EnabledAtRuntime=DataTransferItems] DataTransferItems items; 45 47 }; 46 48 -
trunk/Source/WebCore/platform/chromium/ClipboardChromium.cpp
r80493 r80536 32 32 #include "ClipboardMimeTypes.h" 33 33 #include "ClipboardUtilitiesChromium.h" 34 #include "DataTransferItemsChromium.h" 34 35 #include "Document.h" 35 36 #include "DragData.h" … … 343 344 } 344 345 346 PassRefPtr<DataTransferItems> ClipboardChromium::items() 347 { 348 return DataTransferItemsChromium::create(this, m_frame->document()->scriptExecutionContext()); 349 } 350 345 351 } // namespace WebCore -
trunk/Source/WebCore/platform/chromium/ClipboardChromium.h
r80185 r80536 81 81 virtual bool hasData(); 82 82 83 virtual PassRefPtr<DataTransferItems> items(); 84 83 85 private: 84 86 ClipboardChromium(ClipboardType, PassRefPtr<ChromiumDataObject>, ClipboardAccessPolicy, Frame*); -
trunk/Source/WebKit/chromium/ChangeLog
r80530 r80536 1 2011-03-07 Daniel Cheng <dcheng@chromium.org> 2 3 Reviewed by David Levin. 4 5 Add support for DataTransferItems 6 https://bugs.webkit.org/show_bug.cgi?id=55115 7 8 Add new runtime enabled flag for data transfer items feature. 9 10 * public/WebRuntimeFeatures.h: 11 * src/WebRuntimeFeatures.cpp: 12 (WebKit::WebRuntimeFeatures::enableDataTransferItems): 13 (WebKit::WebRuntimeFeatures::isDataTransferItemsEnabled): 14 1 15 2011-03-07 Ryosuke Niwa <rniwa@webkit.org> 2 16 -
trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h
r78095 r80536 64 64 WEBKIT_API static void enableApplicationCache(bool); 65 65 WEBKIT_API static bool isApplicationCacheEnabled(); 66 67 WEBKIT_API static void enableDataTransferItems(bool); 68 WEBKIT_API static bool isDataTransferItemsEnabled(); 66 69 67 70 WEBKIT_API static void enableGeolocation(bool); -
trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
r78095 r80536 153 153 } 154 154 155 void WebRuntimeFeatures::enableDataTransferItems(bool enable) 156 { 157 #if ENABLE(DATA_TRANSFER_ITEMS) 158 RuntimeEnabledFeatures::setDataTransferItemsEnabled(enable); 159 #endif 160 } 161 162 bool WebRuntimeFeatures::isDataTransferItemsEnabled() 163 { 164 #if ENABLE(DATA_TRANSFER_ITEMS) 165 return RuntimeEnabledFeatures::dataTransferItemsEnabled(); 166 #else 167 return false; 168 #endif 169 } 170 155 171 void WebRuntimeFeatures::enableGeolocation(bool enable) 156 172 { -
trunk/Tools/ChangeLog
r80535 r80536 1 2011-03-07 Daniel Cheng <dcheng@chromium.org> 2 3 Reviewed by David Levin. 4 5 Add support for DataTransferItems 6 https://bugs.webkit.org/show_bug.cgi?id=55115 7 8 Enable data transfer items in DRT. 9 10 * DumpRenderTree/chromium/TestShell.cpp: 11 (TestShell::TestShell): 12 1 13 2011-03-06 Ojan Vafai <ojan@chromium.org> 2 14 -
trunk/Tools/DumpRenderTree/chromium/TestShell.cpp
r79975 r80536 91 91 , m_dumpWhenFinished(true) 92 92 { 93 WebRuntimeFeatures::enableDataTransferItems(true); 93 94 WebRuntimeFeatures::enableGeolocation(true); 94 95 WebRuntimeFeatures::enableIndexedDatabase(true);
Note: See TracChangeset
for help on using the changeset viewer.