Changeset 87143 in webkit
- Timestamp:
- May 24, 2011 3:54:06 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 added
- 8 deleted
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r87125 r87143 332 332 page/PerformanceNavigation.idl 333 333 page/PerformanceTiming.idl 334 page/PositionCallback.idl 334 335 page/PositionError.idl 336 page/PositionErrorCallback.idl 335 337 page/Screen.idl 336 338 page/SpeechInputEvent.idl -
trunk/Source/WebCore/ChangeLog
r87140 r87143 1 2011-04-13 Steve Block <steveblock@google.com> 2 3 Reviewed by Eric Seidel. 4 5 Geolocation callbacks should make use of new callback generation mechanism 6 https://bugs.webkit.org/show_bug.cgi?id=40065 7 8 No new tests, refactoring only. 9 10 * Android.derived.jscbindings.mk: 11 * Android.derived.v8bindings.mk: 12 * Android.jscbindings.mk: 13 * Android.v8bindings.mk: 14 * CMakeLists.txt: 15 * CodeGenerators.pri: 16 * DerivedSources.cpp: 17 * DerivedSources.make: 18 * GNUmakefile.list.am: 19 * UseJSC.cmake: 20 * WebCore.gypi: 21 * WebCore.order: 22 * WebCore.pro: 23 * WebCore.vcproj/WebCore.vcproj: 24 * WebCore.xcodeproj/project.pbxproj: 25 * bindings/js/JSBindingsAllInOne.cpp: 26 * bindings/js/JSCustomPositionCallback.cpp: Removed. 27 * bindings/js/JSCustomPositionCallback.h: Removed. 28 * bindings/js/JSCustomPositionErrorCallback.cpp: Removed. 29 * bindings/js/JSCustomPositionErrorCallback.h: Removed. 30 * bindings/js/JSGeolocationCustom.cpp: 31 (WebCore::JSGeolocation::getCurrentPosition): 32 (WebCore::JSGeolocation::watchPosition): 33 * bindings/v8/custom/V8CustomPositionCallback.cpp: Removed. 34 * bindings/v8/custom/V8CustomPositionCallback.h: Removed. 35 * bindings/v8/custom/V8CustomPositionErrorCallback.cpp: Removed. 36 * bindings/v8/custom/V8CustomPositionErrorCallback.h: Removed. 37 * bindings/v8/custom/V8GeolocationCustom.cpp: 38 (WebCore::V8Geolocation::getCurrentPositionCallback): 39 (WebCore::V8Geolocation::watchPositionCallback): 40 * page/PositionCallback.h: 41 * page/PositionCallback.idl: Added. 42 * page/PositionErrorCallback.h: 43 * page/PositionErrorCallback.idl: Added. 44 1 45 2011-05-23 Pavel Podivilov <podivilov@chromium.org> 2 46 -
trunk/Source/WebCore/CodeGenerators.pri
r86949 r87143 332 332 page/PerformanceNavigation.idl \ 333 333 page/PerformanceTiming.idl \ 334 page/PositionCallback.idl \ 334 335 page/PositionError.idl \ 336 page/PositionErrorCallback.idl \ 335 337 page/Screen.idl \ 336 338 page/SpeechInputEvent.idl \ -
trunk/Source/WebCore/DerivedSources.cpp
r86764 r87143 256 256 #include "JSPerformanceTiming.cpp" 257 257 #include "JSPopStateEvent.cpp" 258 #include "JSPositionCallback.cpp" 258 259 #include "JSPositionError.cpp" 260 #include "JSPositionErrorCallback.cpp" 259 261 #include "JSProcessingInstruction.cpp" 260 262 #include "JSProgressEvent.cpp" -
trunk/Source/WebCore/DerivedSources.make
r86936 r87143 325 325 PerformanceTiming \ 326 326 PopStateEvent \ 327 PositionCallback \ 327 328 PositionError \ 329 PositionErrorCallback \ 328 330 ProcessingInstruction \ 329 331 ProgressEvent \ -
trunk/Source/WebCore/GNUmakefile.list.am
r87125 r87143 406 406 DerivedSources/WebCore/JSPopStateEvent.cpp \ 407 407 DerivedSources/WebCore/JSPopStateEvent.h \ 408 DerivedSources/WebCore/JSPositionCallback.cpp \ 409 DerivedSources/WebCore/JSPositionCallback.h \ 408 410 DerivedSources/WebCore/JSPositionError.cpp \ 409 411 DerivedSources/WebCore/JSPositionError.h \ 412 DerivedSources/WebCore/JSPositionErrorCallback.cpp \ 413 DerivedSources/WebCore/JSPositionErrorCallback.h \ 410 414 DerivedSources/WebCore/JSProcessingInstruction.cpp \ 411 415 DerivedSources/WebCore/JSProcessingInstruction.h \ … … 654 658 Source/WebCore/bindings/js/JSConsoleCustom.cpp \ 655 659 Source/WebCore/bindings/js/JSCoordinatesCustom.cpp \ 656 Source/WebCore/bindings/js/JSCustomPositionCallback.cpp \657 Source/WebCore/bindings/js/JSCustomPositionCallback.h \658 Source/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp \659 Source/WebCore/bindings/js/JSCustomPositionErrorCallback.h \660 660 Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp \ 661 661 Source/WebCore/bindings/js/JSCustomVoidCallback.cpp \ -
trunk/Source/WebCore/UseJSC.cmake
r86234 r87143 32 32 bindings/js/JSConsoleCustom.cpp 33 33 bindings/js/JSCoordinatesCustom.cpp 34 bindings/js/JSCustomPositionCallback.cpp35 bindings/js/JSCustomPositionErrorCallback.cpp36 34 bindings/js/JSCustomSQLStatementErrorCallback.cpp 37 35 bindings/js/JSCustomVoidCallback.cpp -
trunk/Source/WebCore/WebCore.gypi
r87140 r87143 1345 1345 'page/PerformanceNavigation.idl', 1346 1346 'page/PerformanceTiming.idl', 1347 'page/PositionCallback.idl', 1347 1348 'page/PositionError.idl', 1349 'page/PositionErrorCallback.idl', 1348 1350 'page/Screen.idl', 1349 1351 'page/SpeechInputEvent.idl', … … 1733 1735 'bindings/js/JSConvolverNodeCustom.cpp', 1734 1736 'bindings/js/JSCoordinatesCustom.cpp', 1735 'bindings/js/JSCustomPositionCallback.cpp',1736 'bindings/js/JSCustomPositionCallback.h',1737 'bindings/js/JSCustomPositionErrorCallback.cpp',1738 'bindings/js/JSCustomPositionErrorCallback.h',1739 1737 'bindings/js/JSCustomSQLStatementErrorCallback.cpp', 1740 1738 'bindings/js/JSCustomVoidCallback.cpp', … … 2076 2074 'bindings/v8/custom/V8ConsoleCustom.cpp', 2077 2075 'bindings/v8/custom/V8CoordinatesCustom.cpp', 2078 'bindings/v8/custom/V8CustomPositionCallback.cpp',2079 'bindings/v8/custom/V8CustomPositionCallback.h',2080 'bindings/v8/custom/V8CustomPositionErrorCallback.cpp',2081 'bindings/v8/custom/V8CustomPositionErrorCallback.h',2082 2076 'bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp', 2083 2077 'bindings/v8/custom/V8CustomVoidCallback.cpp', … … 7405 7399 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPopStateEvent.cpp', 7406 7400 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPopStateEvent.h', 7401 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPositionCallback.cpp', 7402 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPositionCallback.h', 7407 7403 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPositionError.cpp', 7408 7404 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPositionError.h', 7405 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPositionErrorCallback.cpp', 7406 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPositionErrorCallback.h', 7409 7407 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSProcessingInstruction.cpp', 7410 7408 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSProcessingInstruction.h', -
trunk/Source/WebCore/WebCore.order
r81603 r87143 12765 12765 __ZN7WebCore13JSGeolocation18getCurrentPositionEPN3JSC9ExecStateERKNS1_7ArgListE 12766 12766 __ZN7WebCoreL22createPositionCallbackEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectENS0_7JSValueE 12767 __ZN7WebCore24JS CustomPositionCallbackC1EPN3JSC8JSObjectEPNS_17JSDOMGlobalObjectE12768 __ZN7WebCore24JS CustomPositionCallbackC2EPN3JSC8JSObjectEPNS_17JSDOMGlobalObjectE12767 __ZN7WebCore24JSPositionCallbackC1EPN3JSC8JSObjectEPNS_17JSDOMGlobalObjectE 12768 __ZN7WebCore24JSPositionCallbackC2EPN3JSC8JSObjectEPNS_17JSDOMGlobalObjectE 12769 12769 __ZN7WebCoreL27createPositionErrorCallbackEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectENS0_7JSValueE 12770 __ZN7WebCore29JS CustomPositionErrorCallbackC1EPN3JSC8JSObjectEPNS_17JSDOMGlobalObjectE12771 __ZN7WebCore29JS CustomPositionErrorCallbackC2EPN3JSC8JSObjectEPNS_17JSDOMGlobalObjectE12770 __ZN7WebCore29JSPositionErrorCallbackC1EPN3JSC8JSObjectEPNS_17JSDOMGlobalObjectE 12771 __ZN7WebCore29JSPositionErrorCallbackC2EPN3JSC8JSObjectEPNS_17JSDOMGlobalObjectE 12772 12772 __ZN7WebCoreL21createPositionOptionsEPN3JSC9ExecStateENS0_7JSValueE 12773 12773 __ZN7WebCore11Geolocation18getCurrentPositionEN3WTF10PassRefPtrINS_16PositionCallbackEEENS2_INS_21PositionErrorCallbackEEENS2_I … … 12788 12788 __ZN7WebCore5TimerINS_11Geolocation11GeoNotifierEE5firedEv 12789 12789 __ZN7WebCore11Geolocation11GeoNotifier10timerFiredEPNS_5TimerIS1_EE 12790 __ZN7WebCore29JS CustomPositionErrorCallback11handleEventEPNS_13PositionErrorE12790 __ZN7WebCore29JSPositionErrorCallback11handleEventEPNS_13PositionErrorE 12791 12791 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_13PositionErrorE 12792 12792 __ZN7WebCore15JSPositionError15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE … … 12798 12798 __ZNK7WebCore11Geolocation8Watchers7isEmptyEv 12799 12799 __ZN7WebCore11Geolocation12stopUpdatingEv 12800 __ZN7WebCore29JS CustomPositionErrorCallbackD0Ev12801 __ZN7WebCore24JS CustomPositionCallbackD0Ev12800 __ZN7WebCore29JSPositionErrorCallbackD0Ev 12801 __ZN7WebCore24JSPositionCallbackD0Ev 12802 12802 __ZN7WebCore15JSPositionErrorD1Ev 12803 12803 __ZN7WebCore15JSPositionErrorD2Ev -
trunk/Source/WebCore/WebCore.pro
r87125 r87143 252 252 bindings/js/JSConsoleCustom.cpp \ 253 253 bindings/js/JSCoordinatesCustom.cpp \ 254 bindings/js/JSCustomPositionCallback.cpp \255 bindings/js/JSCustomPositionErrorCallback.cpp \256 254 bindings/js/JSCustomVoidCallback.cpp \ 257 255 bindings/js/JSCustomXPathNSResolver.cpp \ … … 1214 1212 v8 { 1215 1213 HEADERS += \ 1216 bindings/v8/custom/V8CustomPositionCallback.h \1217 bindings/v8/custom/V8CustomPositionErrorCallback.h \1218 1214 bindings/v8/custom/V8CustomVoidCallback.h \ 1219 1215 bindings/v8/custom/V8CustomXPathNSResolver.h \ … … 1293 1289 bindings/js/JSCSSStyleDeclarationCustom.h \ 1294 1290 bindings/js/JSCallbackData.h \ 1295 bindings/js/JSCustomPositionCallback.h \1296 bindings/js/JSCustomPositionErrorCallback.h \1297 1291 bindings/js/JSCustomVoidCallback.h \ 1298 1292 bindings/js/JSCustomXPathNSResolver.h \ … … 3105 3099 v8 { 3106 3100 SOURCES += \ 3107 bindings/v8/custom/V8CustomPositionCallback.cpp \3108 bindings/v8/custom/V8CustomPositionErrorCallback.cpp \3109 3101 bindings/v8/custom/V8GeolocationCustom.cpp 3110 3102 } -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r87125 r87143 12327 12327 </File> 12328 12328 <File 12329 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSPositionCallback.cpp" 12330 > 12331 <FileConfiguration 12332 Name="Debug|Win32" 12333 ExcludedFromBuild="true" 12334 > 12335 <Tool 12336 Name="VCCLCompilerTool" 12337 /> 12338 </FileConfiguration> 12339 <FileConfiguration 12340 Name="Release|Win32" 12341 ExcludedFromBuild="true" 12342 > 12343 <Tool 12344 Name="VCCLCompilerTool" 12345 /> 12346 </FileConfiguration> 12347 <FileConfiguration 12348 Name="Debug_Cairo_CFLite|Win32" 12349 ExcludedFromBuild="true" 12350 > 12351 <Tool 12352 Name="VCCLCompilerTool" 12353 /> 12354 </FileConfiguration> 12355 <FileConfiguration 12356 Name="Release_Cairo_CFLite|Win32" 12357 ExcludedFromBuild="true" 12358 > 12359 <Tool 12360 Name="VCCLCompilerTool" 12361 /> 12362 </FileConfiguration> 12363 <FileConfiguration 12364 Name="Debug_All|Win32" 12365 ExcludedFromBuild="true" 12366 > 12367 <Tool 12368 Name="VCCLCompilerTool" 12369 /> 12370 </FileConfiguration> 12371 <FileConfiguration 12372 Name="Production|Win32" 12373 ExcludedFromBuild="true" 12374 > 12375 <Tool 12376 Name="VCCLCompilerTool" 12377 /> 12378 </FileConfiguration> 12379 </File> 12380 <File 12381 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSPositionCallback.h" 12382 > 12383 </File> 12384 <File 12329 12385 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSPositionError.cpp" 12330 12386 > … … 12380 12436 <File 12381 12437 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSPositionError.h" 12438 > 12439 </File> 12440 <File 12441 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSPositionErrorCallback.cpp" 12442 > 12443 <FileConfiguration 12444 Name="Debug|Win32" 12445 ExcludedFromBuild="true" 12446 > 12447 <Tool 12448 Name="VCCLCompilerTool" 12449 /> 12450 </FileConfiguration> 12451 <FileConfiguration 12452 Name="Release|Win32" 12453 ExcludedFromBuild="true" 12454 > 12455 <Tool 12456 Name="VCCLCompilerTool" 12457 /> 12458 </FileConfiguration> 12459 <FileConfiguration 12460 Name="Debug_Cairo_CFLite|Win32" 12461 ExcludedFromBuild="true" 12462 > 12463 <Tool 12464 Name="VCCLCompilerTool" 12465 /> 12466 </FileConfiguration> 12467 <FileConfiguration 12468 Name="Release_Cairo_CFLite|Win32" 12469 ExcludedFromBuild="true" 12470 > 12471 <Tool 12472 Name="VCCLCompilerTool" 12473 /> 12474 </FileConfiguration> 12475 <FileConfiguration 12476 Name="Debug_All|Win32" 12477 ExcludedFromBuild="true" 12478 > 12479 <Tool 12480 Name="VCCLCompilerTool" 12481 /> 12482 </FileConfiguration> 12483 <FileConfiguration 12484 Name="Production|Win32" 12485 ExcludedFromBuild="true" 12486 > 12487 <Tool 12488 Name="VCCLCompilerTool" 12489 /> 12490 </FileConfiguration> 12491 </File> 12492 <File 12493 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSPositionErrorCallback.h" 12382 12494 > 12383 12495 </File> … … 57850 57962 </File> 57851 57963 <File 57852 RelativePath="..\bindings\js\JSCustomPositionCallback.cpp"57853 >57854 <FileConfiguration57855 Name="Debug|Win32"57856 ExcludedFromBuild="true"57857 >57858 <Tool57859 Name="VCCLCompilerTool"57860 />57861 </FileConfiguration>57862 <FileConfiguration57863 Name="Release|Win32"57864 ExcludedFromBuild="true"57865 >57866 <Tool57867 Name="VCCLCompilerTool"57868 />57869 </FileConfiguration>57870 <FileConfiguration57871 Name="Debug_Cairo_CFLite|Win32"57872 ExcludedFromBuild="true"57873 >57874 <Tool57875 Name="VCCLCompilerTool"57876 />57877 </FileConfiguration>57878 <FileConfiguration57879 Name="Release_Cairo_CFLite|Win32"57880 ExcludedFromBuild="true"57881 >57882 <Tool57883 Name="VCCLCompilerTool"57884 />57885 </FileConfiguration>57886 <FileConfiguration57887 Name="Debug_All|Win32"57888 ExcludedFromBuild="true"57889 >57890 <Tool57891 Name="VCCLCompilerTool"57892 />57893 </FileConfiguration>57894 <FileConfiguration57895 Name="Production|Win32"57896 ExcludedFromBuild="true"57897 >57898 <Tool57899 Name="VCCLCompilerTool"57900 />57901 </FileConfiguration>57902 </File>57903 <File57904 RelativePath="..\bindings\js\JSCustomPositionCallback.h"57905 >57906 </File>57907 <File57908 RelativePath="..\bindings\js\JSCustomPositionErrorCallback.cpp"57909 >57910 <FileConfiguration57911 Name="Debug|Win32"57912 ExcludedFromBuild="true"57913 >57914 <Tool57915 Name="VCCLCompilerTool"57916 />57917 </FileConfiguration>57918 <FileConfiguration57919 Name="Release|Win32"57920 ExcludedFromBuild="true"57921 >57922 <Tool57923 Name="VCCLCompilerTool"57924 />57925 </FileConfiguration>57926 <FileConfiguration57927 Name="Debug_Cairo_CFLite|Win32"57928 ExcludedFromBuild="true"57929 >57930 <Tool57931 Name="VCCLCompilerTool"57932 />57933 </FileConfiguration>57934 <FileConfiguration57935 Name="Release_Cairo_CFLite|Win32"57936 ExcludedFromBuild="true"57937 >57938 <Tool57939 Name="VCCLCompilerTool"57940 />57941 </FileConfiguration>57942 <FileConfiguration57943 Name="Debug_All|Win32"57944 ExcludedFromBuild="true"57945 >57946 <Tool57947 Name="VCCLCompilerTool"57948 />57949 </FileConfiguration>57950 <FileConfiguration57951 Name="Production|Win32"57952 ExcludedFromBuild="true"57953 >57954 <Tool57955 Name="VCCLCompilerTool"57956 />57957 </FileConfiguration>57958 </File>57959 <File57960 RelativePath="..\bindings\js\JSCustomPositionErrorCallback.h"57961 >57962 </File>57963 <File57964 57964 RelativePath="..\bindings\js\JSCustomSQLStatementErrorCallback.cpp" 57965 57965 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r87125 r87143 1381 1381 596950821321059900C3ED18 /* JobjectWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 596950811321059900C3ED18 /* JobjectWrapper.h */; }; 1382 1382 59695084132105A500C3ED18 /* JobjectWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59695083132105A500C3ED18 /* JobjectWrapper.cpp */; }; 1383 598365DD1355F557001B185D /* JSPositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 598365DC1355F53C001B185D /* JSPositionCallback.h */; }; 1384 598365DF1355F562001B185D /* JSPositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 598365DE1355F562001B185D /* JSPositionErrorCallback.h */; }; 1385 598365E41355F604001B185D /* JSPositionCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 598365E31355F604001B185D /* JSPositionCallback.cpp */; }; 1386 598365E61355F60D001B185D /* JSPositionErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 598365E51355F60D001B185D /* JSPositionErrorCallback.cpp */; }; 1383 1387 598D77DD132541EE00761B22 /* JavaArrayJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 598D77DC132541EE00761B22 /* JavaArrayJSC.cpp */; }; 1384 1388 598D77DF132541FA00761B22 /* JavaArrayJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 598D77DE132541FA00761B22 /* JavaArrayJSC.h */; }; … … 5934 5938 FE6FD48E0F676E9300092873 /* JSCoordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD48C0F676E9300092873 /* JSCoordinates.h */; }; 5935 5939 FE700DD10F92D81A008E2BFE /* JSCoordinatesCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */; }; 5936 FE80D7A70E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */; };5937 FE80D7A80E9C1ED2000D6F75 /* JSCustomPositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */; };5938 FE80D7A90E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */; };5939 FE80D7AA0E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */; };5940 5940 FE80D7AB0E9C1ED2000D6F75 /* JSGeolocationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */; }; 5941 5941 FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */; }; … … 7918 7918 59309A1011F4AE5800250603 /* DeviceOrientationClientMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DeviceOrientationClientMock.cpp; path = mock/DeviceOrientationClientMock.cpp; sourceTree = "<group>"; }; 7919 7919 59309A1211F4AE6A00250603 /* DeviceOrientationClientMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeviceOrientationClientMock.h; path = mock/DeviceOrientationClientMock.h; sourceTree = "<group>"; }; 7920 593AB6971355CD9200FC8211 /* PositionCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionCallback.idl; sourceTree = "<group>"; }; 7921 593AB6991355CDAE00FC8211 /* PositionErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionErrorCallback.idl; sourceTree = "<group>"; }; 7920 7922 593D3EAE1325328C0057E7EE /* JavaMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaMethod.h; sourceTree = "<group>"; }; 7921 7923 593D3EB0132532950057E7EE /* JavaString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaString.h; sourceTree = "<group>"; }; … … 7926 7928 596950811321059900C3ED18 /* JobjectWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JobjectWrapper.h; sourceTree = "<group>"; }; 7927 7929 59695083132105A500C3ED18 /* JobjectWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JobjectWrapper.cpp; sourceTree = "<group>"; }; 7930 598365DC1355F53C001B185D /* JSPositionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPositionCallback.h; sourceTree = "<group>"; }; 7931 598365DE1355F562001B185D /* JSPositionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPositionErrorCallback.h; sourceTree = "<group>"; }; 7932 598365E31355F604001B185D /* JSPositionCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPositionCallback.cpp; sourceTree = "<group>"; }; 7933 598365E51355F60D001B185D /* JSPositionErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPositionErrorCallback.cpp; sourceTree = "<group>"; }; 7928 7934 598D77DC132541EE00761B22 /* JavaArrayJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaArrayJSC.cpp; path = jsc/JavaArrayJSC.cpp; sourceTree = "<group>"; }; 7929 7935 598D77DE132541FA00761B22 /* JavaArrayJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaArrayJSC.h; path = jsc/JavaArrayJSC.h; sourceTree = "<group>"; }; … … 12481 12487 FE6FD48C0F676E9300092873 /* JSCoordinates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCoordinates.h; sourceTree = "<group>"; }; 12482 12488 FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCoordinatesCustom.cpp; sourceTree = "<group>"; }; 12483 FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomPositionCallback.cpp; sourceTree = "<group>"; };12484 FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomPositionCallback.h; sourceTree = "<group>"; };12485 FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomPositionErrorCallback.cpp; sourceTree = "<group>"; };12486 FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomPositionErrorCallback.h; sourceTree = "<group>"; };12487 12489 FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeolocationCustom.cpp; sourceTree = "<group>"; }; 12488 12490 FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geolocation.cpp; sourceTree = "<group>"; }; … … 14125 14127 isa = PBXGroup; 14126 14128 children = ( 14129 593AB6991355CDAE00FC8211 /* PositionErrorCallback.idl */, 14130 593AB6971355CD9200FC8211 /* PositionCallback.idl */, 14127 14131 316FE1060E6E1D8400BF6088 /* animation */, 14128 14132 93C09A820B064F05005ABD4D /* mac */, … … 16833 16837 isa = PBXGroup; 16834 16838 children = ( 16839 598365E51355F60D001B185D /* JSPositionErrorCallback.cpp */, 16840 598365E31355F604001B185D /* JSPositionCallback.cpp */, 16841 598365DE1355F562001B185D /* JSPositionErrorCallback.h */, 16842 598365DC1355F53C001B185D /* JSPositionCallback.h */, 16835 16843 65DF31D809D1C122000BE325 /* JSAttr.cpp */, 16836 16844 65DF31D909D1C123000BE325 /* JSAttr.h */, … … 18442 18450 1449E286107D4DB400B5793F /* JSCallbackData.cpp */, 18443 18451 1449E24A107D4A8400B5793F /* JSCallbackData.h */, 18444 FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */,18445 FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */,18446 FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */,18447 FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */,18448 18452 51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */, 18449 18453 1A3417C80CECFF250049CBDE /* JSCustomVoidCallback.cpp */, … … 21369 21373 A8D05FAC0A23B30F005E7203 /* JSCSSValueList.h in Headers */, 21370 21374 E4778B80115A581A00B5D372 /* JSCustomEvent.h in Headers */, 21371 FE80D7A80E9C1ED2000D6F75 /* JSCustomPositionCallback.h in Headers */,21372 FE80D7AA0E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h in Headers */,21373 21375 1A3417C90CECFF250049CBDE /* JSCustomVoidCallback.h in Headers */, 21374 21376 E10B937C0B73C00A003ED890 /* JSCustomXPathNSResolver.h in Headers */, … … 22836 22838 977E2E0F12F0FC9C00C13379 /* XSSFilter.h in Headers */, 22837 22839 FD537353137B651800008DCE /* ZeroPole.h in Headers */, 22840 598365DD1355F557001B185D /* JSPositionCallback.h in Headers */, 22841 598365DF1355F562001B185D /* JSPositionErrorCallback.h in Headers */, 22838 22842 ); 22839 22843 runOnlyForDeploymentPostprocessing = 0; … … 24179 24183 A8D05FAB0A23B30F005E7203 /* JSCSSValueList.cpp in Sources */, 24180 24184 E4778B7F115A581A00B5D372 /* JSCustomEvent.cpp in Sources */, 24181 FE80D7A70E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp in Sources */,24182 FE80D7A90E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp in Sources */,24183 24185 51EC92650CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp in Sources */, 24184 24186 1A3417CA0CECFF250049CBDE /* JSCustomVoidCallback.cpp in Sources */, … … 25511 25513 977E2E0E12F0FC9C00C13379 /* XSSFilter.cpp in Sources */, 25512 25514 FD537352137B651800008DCE /* ZeroPole.cpp in Sources */, 25515 598365E41355F604001B185D /* JSPositionCallback.cpp in Sources */, 25516 598365E61355F60D001B185D /* JSPositionErrorCallback.cpp in Sources */, 25513 25517 ); 25514 25518 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
r86234 r87143 49 49 #include "JSConsoleCustom.cpp" 50 50 #include "JSCoordinatesCustom.cpp" 51 #include "JSCustomPositionCallback.cpp"52 #include "JSCustomPositionErrorCallback.cpp"53 51 #include "JSCustomSQLStatementErrorCallback.cpp" 54 52 #include "JSCustomVoidCallback.cpp" … … 176 174 #include "WorkerScriptController.cpp" 177 175 #include "WorkerScriptDebugServer.cpp" 178 -
trunk/Source/WebCore/bindings/js/JSGeolocationCustom.cpp
r83079 r87143 32 32 #include "DOMWindow.h" 33 33 #include "Geolocation.h" 34 #include "JSCustomPositionCallback.h"35 #include "JSCustomPositionErrorCallback.h"36 34 #include "JSDOMWindow.h" 35 #include "JSPositionCallback.h" 36 #include "JSPositionErrorCallback.h" 37 37 #include "PositionOptions.h" 38 38 … … 114 114 // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions 115 115 116 RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<JS CustomPositionCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(0));116 RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<JSPositionCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(0)); 117 117 if (exec->hadException()) 118 118 return jsUndefined(); 119 119 ASSERT(positionCallback); 120 120 121 RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<JS CustomPositionErrorCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(1), CallbackAllowUndefined | CallbackAllowNull);121 RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<JSPositionErrorCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(1), CallbackAllowUndefined | CallbackAllowNull); 122 122 if (exec->hadException()) 123 123 return jsUndefined(); … … 136 136 // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions 137 137 138 RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<JS CustomPositionCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(0));138 RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<JSPositionCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(0)); 139 139 if (exec->hadException()) 140 140 return jsUndefined(); 141 141 ASSERT(positionCallback); 142 142 143 RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<JS CustomPositionErrorCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(1), CallbackAllowUndefined | CallbackAllowNull);143 RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<JSPositionErrorCallback>(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), exec->argument(1), CallbackAllowUndefined | CallbackAllowNull); 144 144 if (exec->hadException()) 145 145 return jsUndefined(); -
trunk/Source/WebCore/bindings/v8/custom/V8GeolocationCustom.cpp
r83115 r87143 32 32 #include "Geolocation.h" 33 33 #include "V8Binding.h" 34 #include "V8 CustomPositionCallback.h"35 #include "V8 CustomPositionErrorCallback.h"34 #include "V8PositionCallback.h" 35 #include "V8PositionErrorCallback.h" 36 36 #include "V8Utilities.h" 37 37 … … 134 134 bool succeeded = false; 135 135 136 RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8 CustomPositionCallback>(args[0], succeeded);136 RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8PositionCallback>(args[0], succeeded); 137 137 if (!succeeded) 138 138 return v8::Undefined(); … … 140 140 141 141 // Argument is optional (hence undefined is allowed), and null is allowed. 142 RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8 CustomPositionErrorCallback>(args[1], succeeded, CallbackAllowUndefined | CallbackAllowNull);142 RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8PositionErrorCallback>(args[1], succeeded, CallbackAllowUndefined | CallbackAllowNull); 143 143 if (!succeeded) 144 144 return v8::Undefined(); … … 160 160 bool succeeded = false; 161 161 162 RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8 CustomPositionCallback>(args[0], succeeded);162 RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8PositionCallback>(args[0], succeeded); 163 163 if (!succeeded) 164 164 return v8::Undefined(); … … 166 166 167 167 // Argument is optional (hence undefined is allowed), and null is allowed. 168 RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8 CustomPositionErrorCallback>(args[1], succeeded, CallbackAllowUndefined | CallbackAllowNull);168 RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8PositionErrorCallback>(args[1], succeeded, CallbackAllowUndefined | CallbackAllowNull); 169 169 if (!succeeded) 170 170 return v8::Undefined(); -
trunk/Source/WebCore/page/PositionCallback.h
r60840 r87143 27 27 #define PositionCallback_h 28 28 29 #include "ActiveDOMObject.h"30 29 #include <wtf/RefCounted.h> 31 30 32 31 namespace WebCore { 33 32 34 33 class Geoposition; 35 36 class PositionCallback : public RefCounted<PositionCallback> , public ActiveDOMObject{34 35 class PositionCallback : public RefCounted<PositionCallback> { 37 36 public: 38 PositionCallback(ScriptExecutionContext* context) : ActiveDOMObject(context, this) { }39 37 virtual ~PositionCallback() { } 40 virtual voidhandleEvent(Geoposition*) = 0;38 virtual bool handleEvent(Geoposition*) = 0; 41 39 }; 42 40 43 41 } // namespace WebCore 44 42 -
trunk/Source/WebCore/page/PositionErrorCallback.h
r60840 r87143 27 27 #define PositionErrorCallback_h 28 28 29 #include "ActiveDOMObject.h"30 29 #include <wtf/RefCounted.h> 31 30 … … 34 33 class PositionError; 35 34 36 class PositionErrorCallback : public RefCounted<PositionErrorCallback> , public ActiveDOMObject{35 class PositionErrorCallback : public RefCounted<PositionErrorCallback> { 37 36 public: 38 PositionErrorCallback(ScriptExecutionContext* context) : ActiveDOMObject(context, this) { }39 37 virtual ~PositionErrorCallback() { } 40 virtual voidhandleEvent(PositionError*) = 0;38 virtual bool handleEvent(PositionError*) = 0; 41 39 }; 42 40 43 41 } // namespace WebCore 44 42
Note: See TracChangeset
for help on using the changeset viewer.