Changeset 37842 in webkit
- Timestamp:
- Oct 24, 2008 12:39:15 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 24 deleted
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r37840 r37842 1 2008-10-24 David Kilzer <ddkilzer@apple.com> 2 3 Rolled out r37840. 4 5 * wtf/Platform.h: 6 1 7 2008-10-23 Greg Bolsinga <bolsinga@apple.com> 2 8 -
trunk/JavaScriptCore/wtf/Platform.h
r37840 r37842 352 352 #endif 353 353 354 #if !defined(ENABLE_GEOLOCATION)355 #define ENABLE_GEOLOCATION 0356 #endif357 358 354 // CTI only supports x86 at the moment, and has only been tested on Mac and Windows. 359 355 #if !defined(ENABLE_CTI) && PLATFORM(X86) && (PLATFORM(MAC) || PLATFORM(WIN)) -
trunk/LayoutTests/ChangeLog
r37840 r37842 1 2008-10-24 David Kilzer <ddkilzer@apple.com> 2 3 Rolled out r37840. 4 5 * geolocation/geolocation-not-implemented-expected.txt: Removed. 6 * geolocation/geolocation-not-implemented.html: Removed. 7 * geolocation/geolocation-test.js: Removed. 8 1 9 2008-10-23 Greg Bolsinga <bolsinga@apple.com> 2 10 -
trunk/WebCore/ChangeLog
r37841 r37842 1 2008-10-24 David Kilzer <ddkilzer@apple.com> 2 3 Rolled out r37840 and r37841. 4 5 * DerivedSources.make: 6 * GNUmakefile.am: 7 * WebCore.pro: 8 * WebCore.vcproj/WebCore.vcproj: 9 * WebCore.xcodeproj/project.pbxproj: 10 * WebCoreSources.bkl: 11 * bindings/js/JSCustomPositionCallback.cpp: Removed. 12 * bindings/js/JSCustomPositionCallback.h: Removed. 13 * bindings/js/JSCustomPositionErrorCallback.cpp: Removed. 14 * bindings/js/JSCustomPositionErrorCallback.h: Removed. 15 * bindings/js/JSDOMBinding.cpp: 16 * bindings/js/JSDOMBinding.h: 17 * bindings/js/JSDOMWindowCustom.cpp: 18 (WebCore::markDOMObjectWrapper): 19 * bindings/js/JSGeolocationCustom.cpp: Removed. 20 * bindings/js/JSNavigatorCustom.cpp: 21 * dom/Document.cpp: 22 (WebCore::Document::Document): 23 * dom/Document.h: 24 * loader/FrameLoader.cpp: 25 (WebCore::FrameLoader::canCachePage): 26 * page/Geolocation.cpp: Removed. 27 * page/Geolocation.h: Removed. 28 * page/Geolocation.idl: Removed. 29 * page/Geoposition.cpp: Removed. 30 * page/Geoposition.h: Removed. 31 * page/Geoposition.idl: Removed. 32 * page/Navigator.cpp: 33 (WebCore::Navigator::disconnectFrame): 34 * page/Navigator.h: 35 * page/Navigator.idl: 36 * page/PositionCallback.h: Removed. 37 * page/PositionCallback.idl: Removed. 38 * page/PositionError.h: Removed. 39 * page/PositionError.idl: Removed. 40 * page/PositionErrorCallback.h: Removed. 41 * page/PositionErrorCallback.idl: Removed. 42 * page/PositionOptions.h: Removed. 43 * page/PositionOptions.idl: Removed. 44 * platform/GeolocationService.cpp: Removed. 45 * platform/GeolocationService.h: Removed. 46 1 47 2008-10-23 David Kilzer <ddkilzer@apple.com> 2 48 -
trunk/WebCore/DerivedSources.make
r37840 r37842 94 94 File \ 95 95 FileList \ 96 Geolocation \97 Geoposition \98 96 HTMLAnchorElement \ 99 97 HTMLAppletElement \ … … 183 181 Plugin \ 184 182 PluginArray \ 185 PositionCallback \186 PositionError \187 PositionErrorCallback \188 PositionOptions \189 183 ProcessingInstruction \ 190 184 ProgressEvent \ -
trunk/WebCore/GNUmakefile.am
r37841 r37842 210 210 WebCore/page/DOMSelection.idl \ 211 211 WebCore/page/DOMWindow.idl \ 212 WebCore/page/Geolocation.idl \213 WebCore/page/Geoposition.idl \214 212 WebCore/page/History.idl \ 215 213 WebCore/page/Location.idl \ 216 214 WebCore/page/Navigator.idl \ 217 WebCore/page/PositionCallback.idl \218 WebCore/page/PositionError.idl \219 WebCore/page/PositionErrorCallback.idl \220 WebCore/page/PositionOptions.idl \221 215 WebCore/page/Screen.idl \ 222 216 WebCore/plugins/MimeType.idl \ … … 332 326 WebCore/bindings/js/JSClipboardCustom.cpp \ 333 327 WebCore/bindings/js/JSConsoleCustom.cpp \ 334 WebCore/bindings/js/JSCustomPositionCallback.cpp \335 WebCore/bindings/js/JSCustomPositionCallback.h \336 WebCore/bindings/js/JSCustomPositionErrorCallback.cpp \337 WebCore/bindings/js/JSCustomPositionErrorCallback.h \338 328 WebCore/bindings/js/JSCustomVoidCallback.cpp \ 339 329 WebCore/bindings/js/JSCustomVoidCallback.h \ … … 360 350 WebCore/bindings/js/JSEventTargetBase.h \ 361 351 WebCore/bindings/js/JSEventTargetNodeCustom.cpp \ 362 WebCore/bindings/js/JSGeolocationCustom.cpp \363 352 WebCore/bindings/js/JSHTMLAllCollection.cpp \ 364 353 WebCore/bindings/js/JSHTMLAllCollection.h \ … … 1202 1191 WebCore/page/FrameView.cpp \ 1203 1192 WebCore/page/FrameView.h \ 1204 WebCore/page/Geolocation.cpp \1205 WebCore/page/Geolocation.h \1206 WebCore/page/Geoposition.cpp \1207 WebCore/page/Geoposition.h \1208 1193 WebCore/page/History.cpp \ 1209 1194 WebCore/page/History.h \ … … 1218 1203 WebCore/page/PageGroup.cpp \ 1219 1204 WebCore/page/PageGroup.h \ 1220 WebCore/page/PositionCallback.h \1221 WebCore/page/PositionError.h \1222 WebCore/page/PositionErrorCallback.h \1223 WebCore/page/PositionOptions.h \1224 1205 WebCore/page/PrintContext.cpp \ 1225 1206 WebCore/page/PrintContext.h \ … … 1267 1248 WebCore/platform/FileSystem.h \ 1268 1249 WebCore/platform/FloatConversion.h \ 1269 WebCore/platform/GeolocationService.cpp \1270 WebCore/platform/GeolocationService.h \1271 1250 WebCore/platform/HostWindow.h \ 1272 1251 WebCore/platform/KURL.cpp \ -
trunk/WebCore/WebCore.pro
r37840 r37842 778 778 page/FrameTree.cpp \ 779 779 page/FrameView.cpp \ 780 page/Geolocation.cpp \781 page/Geoposition.cpp \782 780 page/History.cpp \ 783 781 page/Location.cpp \ … … 807 805 platform/DragImage.cpp \ 808 806 platform/FileChooser.cpp \ 809 platform/GeolocationService.cpp \810 807 platform/graphics/FontDescription.cpp \ 811 808 platform/graphics/FontFamily.cpp \ … … 1203 1200 bindings/js/JSDatabaseCustom.cpp \ 1204 1201 bindings/js/JSSQLResultSetRowListCustom.cpp \ 1205 bindings/js/JSSQLTransactionCustom.cpp \ 1206 bindings/js/JSGeolocationCustom.cpp \ 1207 bindings/js/JSCustomPositionCallback.cpp \ 1208 bindings/js/JSCustomPositionErrorCallback.cpp 1202 bindings/js/JSSQLTransactionCustom.cpp 1209 1203 1210 1204 IDL_BINDINGS += \ -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r37840 r37842 681 681 </File> 682 682 <File 683 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSGeolocation.h"684 >685 </File>686 <File687 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSGeoposition.h"688 >689 </File>690 <File691 683 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSEvent.h" 692 684 > … … 1046 1038 <File 1047 1039 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNotation.h" 1048 >1049 </File>1050 <File1051 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPositionError.h"1052 >1053 </File>1054 <File1055 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPositionOptions.h"1056 1040 > 1057 1041 </File> … … 2277 2261 </File> 2278 2262 <File 2279 RelativePath="..\page\Geolocation.cpp"2280 >2281 <FileConfiguration2282 Name="Release_PGO|Win32"2283 >2284 <Tool2285 Name="VCCLCompilerTool"2286 WholeProgramOptimization="true"2287 />2288 </FileConfiguration>2289 </File>2290 <File2291 RelativePath="..\page\Geolocation.h"2292 >2293 </File>2294 <File2295 RelativePath="..\page\Geoposition.cpp"2296 >2297 <FileConfiguration2298 Name="Release_PGO|Win32"2299 >2300 <Tool2301 Name="VCCLCompilerTool"2302 WholeProgramOptimization="true"2303 />2304 </FileConfiguration>2305 </File>2306 <File2307 RelativePath="..\page\Geoposition.h"2308 >2309 </File>2310 <File2311 2263 RelativePath="..\page\History.cpp" 2312 2264 > … … 2434 2386 <File 2435 2387 RelativePath="..\page\Plugin.h" 2436 >2437 </File>2438 <File2439 RelativePath="..\page\PositionCallback.h"2440 >2441 </File>2442 <File2443 RelativePath="..\page\PositionError.h"2444 >2445 </File>2446 <File2447 RelativePath="..\page\PositionErrorCallback.h"2448 >2449 </File>2450 <File2451 RelativePath="..\page\PositionOptions.h"2452 2388 > 2453 2389 </File> … … 3102 3038 <File 3103 3039 RelativePath="..\platform\FloatConversion.h" 3104 >3105 </File>3106 <File3107 RelativePath="..\platform\GeolocationService.cpp"3108 >3109 </File>3110 <File3111 RelativePath="..\platform\GeolocationService.h"3112 3040 > 3113 3041 </File> … … 13274 13202 </File> 13275 13203 <File 13276 RelativePath="..\bindings\js\JSCustomPositionCallback.cpp"13277 >13278 </File>13279 <File13280 RelativePath="..\bindings\js\JSCustomPositionErrorCallback.cpp"13281 >13282 </File>13283 <File13284 13204 RelativePath="..\bindings\js\JSCustomSQLStatementCallback.cpp" 13285 13205 > … … 13415 13335 <File 13416 13336 RelativePath="..\bindings\js\JSEventTargetNodeCustom.cpp" 13417 >13418 </File>13419 <File13420 RelativePath="..\bindings\js\JSGeolocationCustom.cpp"13421 13337 > 13422 13338 </File> -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r37840 r37842 4239 4239 F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */; }; 4240 4240 F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */; }; 4241 FE80D7A70E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */; };4242 FE80D7A80E9C1ED2000D6F75 /* JSCustomPositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */; };4243 FE80D7A90E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */; };4244 FE80D7AA0E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */; };4245 FE80D7AB0E9C1ED2000D6F75 /* JSGeolocationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */; };4246 FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */; };4247 FE80D7C60E9C1F25000D6F75 /* Geolocation.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7B80E9C1F25000D6F75 /* Geolocation.h */; settings = {ATTRIBUTES = (); }; };4248 FE80D7C80E9C1F25000D6F75 /* Geoposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */; };4249 FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */; };4250 FE80D7CB0E9C1F25000D6F75 /* PositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */; };4251 FE80D7CD0E9C1F25000D6F75 /* PositionError.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BF0E9C1F25000D6F75 /* PositionError.h */; };4252 FE80D7CF0E9C1F25000D6F75 /* PositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */; };4253 FE80D7D10E9C1F25000D6F75 /* PositionOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */; };4254 FE80DA630E9C4703000D6F75 /* JSGeolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */; };4255 FE80DA640E9C4703000D6F75 /* JSGeolocation.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80DA600E9C4703000D6F75 /* JSGeolocation.h */; };4256 FE80DA650E9C4703000D6F75 /* JSGeoposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA610E9C4703000D6F75 /* JSGeoposition.cpp */; };4257 FE80DA660E9C4703000D6F75 /* JSGeoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80DA620E9C4703000D6F75 /* JSGeoposition.h */; };4258 FE80DA710E9C472F000D6F75 /* JSPositionError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA6D0E9C472F000D6F75 /* JSPositionError.cpp */; };4259 FE80DA720E9C472F000D6F75 /* JSPositionError.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80DA6E0E9C472F000D6F75 /* JSPositionError.h */; };4260 FE80DA730E9C472F000D6F75 /* JSPositionOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA6F0E9C472F000D6F75 /* JSPositionOptions.cpp */; };4261 FE80DA740E9C472F000D6F75 /* JSPositionOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80DA700E9C472F000D6F75 /* JSPositionOptions.h */; };4262 FEAB90120EA51B9C006348C3 /* GeolocationService.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEAB90100EA51B9C006348C3 /* GeolocationService.cpp */; };4263 FEAB90130EA51B9C006348C3 /* GeolocationService.h in Headers */ = {isa = PBXBuildFile; fileRef = FEAB90110EA51B9C006348C3 /* GeolocationService.h */; };4264 4241 /* End PBXBuildFile section */ 4265 4242 … … 8895 8872 F9F0ED780DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = XMLHttpRequestProgressEvent.idl; sourceTree = "<group>"; }; 8896 8873 FE49EF970DC51462004266E1 /* DashboardSupportCSSPropertyNames.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DashboardSupportCSSPropertyNames.in; sourceTree = "<group>"; }; 8897 FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomPositionCallback.cpp; sourceTree = "<group>"; };8898 FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomPositionCallback.h; sourceTree = "<group>"; };8899 FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomPositionErrorCallback.cpp; sourceTree = "<group>"; };8900 FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomPositionErrorCallback.h; sourceTree = "<group>"; };8901 FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeolocationCustom.cpp; sourceTree = "<group>"; };8902 FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geolocation.cpp; sourceTree = "<group>"; };8903 FE80D7B80E9C1F25000D6F75 /* Geolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geolocation.h; sourceTree = "<group>"; };8904 FE80D7B90E9C1F25000D6F75 /* Geolocation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Geolocation.idl; sourceTree = "<group>"; };8905 FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geoposition.cpp; sourceTree = "<group>"; };8906 FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geoposition.h; sourceTree = "<group>"; };8907 FE80D7BC0E9C1F25000D6F75 /* Geoposition.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Geoposition.idl; sourceTree = "<group>"; };8908 FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionCallback.h; sourceTree = "<group>"; };8909 FE80D7BE0E9C1F25000D6F75 /* PositionCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionCallback.idl; sourceTree = "<group>"; };8910 FE80D7BF0E9C1F25000D6F75 /* PositionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionError.h; sourceTree = "<group>"; };8911 FE80D7C00E9C1F25000D6F75 /* PositionError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionError.idl; sourceTree = "<group>"; };8912 FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionErrorCallback.h; sourceTree = "<group>"; };8913 FE80D7C20E9C1F25000D6F75 /* PositionErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionErrorCallback.idl; sourceTree = "<group>"; };8914 FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionOptions.h; sourceTree = "<group>"; };8915 FE80D7C40E9C1F25000D6F75 /* PositionOptions.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionOptions.idl; sourceTree = "<group>"; };8916 FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeolocation.cpp; sourceTree = "<group>"; };8917 FE80DA600E9C4703000D6F75 /* JSGeolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGeolocation.h; sourceTree = "<group>"; };8918 FE80DA610E9C4703000D6F75 /* JSGeoposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeoposition.cpp; sourceTree = "<group>"; };8919 FE80DA620E9C4703000D6F75 /* JSGeoposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGeoposition.h; sourceTree = "<group>"; };8920 FE80DA6D0E9C472F000D6F75 /* JSPositionError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPositionError.cpp; sourceTree = "<group>"; };8921 FE80DA6E0E9C472F000D6F75 /* JSPositionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPositionError.h; sourceTree = "<group>"; };8922 FE80DA6F0E9C472F000D6F75 /* JSPositionOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPositionOptions.cpp; sourceTree = "<group>"; };8923 FE80DA700E9C472F000D6F75 /* JSPositionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPositionOptions.h; sourceTree = "<group>"; };8924 FEAB90100EA51B9C006348C3 /* GeolocationService.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationService.cpp; sourceTree = "<group>"; };8925 FEAB90110EA51B9C006348C3 /* GeolocationService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationService.h; sourceTree = "<group>"; };8926 8874 /* End PBXFileReference section */ 8927 8875 … … 9676 9624 65CBFEF70974F607001DAC25 /* FrameView.cpp */, 9677 9625 65CBFEF80974F607001DAC25 /* FrameView.h */, 9678 FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */,9679 FE80D7B80E9C1F25000D6F75 /* Geolocation.h */,9680 FE80D7B90E9C1F25000D6F75 /* Geolocation.idl */,9681 FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */,9682 FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */,9683 FE80D7BC0E9C1F25000D6F75 /* Geoposition.idl */,9684 9626 BC94D1500C275C8B006BC617 /* History.cpp */, 9685 9627 BC94D1510C275C8B006BC617 /* History.h */, … … 9697 9639 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */, 9698 9640 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */, 9699 FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */,9700 FE80D7BE0E9C1F25000D6F75 /* PositionCallback.idl */,9701 FE80D7BF0E9C1F25000D6F75 /* PositionError.h */,9702 FE80D7C00E9C1F25000D6F75 /* PositionError.idl */,9703 FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */,9704 FE80D7C20E9C1F25000D6F75 /* PositionErrorCallback.idl */,9705 FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */,9706 FE80D7C40E9C1F25000D6F75 /* PositionOptions.idl */,9707 9641 BCEC01BA0C274DAC009F4EC9 /* Screen.cpp */, 9708 9642 BCEC01BB0C274DAC009F4EC9 /* Screen.h */, … … 11868 11802 93F9B7720BA5FDDC00854064 /* JSEntityReference.cpp */, 11869 11803 93F9B7730BA5FDDC00854064 /* JSEntityReference.h */, 11870 FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */,11871 FE80DA600E9C4703000D6F75 /* JSGeolocation.h */,11872 FE80DA610E9C4703000D6F75 /* JSGeoposition.cpp */,11873 FE80DA620E9C4703000D6F75 /* JSGeoposition.h */,11874 11804 BCD9C2BC0C17B69E005C90A2 /* JSNamedNodeMap.cpp */, 11875 11805 BCD9C2BD0C17B69E005C90A2 /* JSNamedNodeMap.h */, … … 11880 11810 65DF31E909D1CC60000BE325 /* JSNotation.cpp */, 11881 11811 65DF31EA09D1CC60000BE325 /* JSNotation.h */, 11882 FE80DA6D0E9C472F000D6F75 /* JSPositionError.cpp */,11883 FE80DA6E0E9C472F000D6F75 /* JSPositionError.h */,11884 FE80DA6F0E9C472F000D6F75 /* JSPositionOptions.cpp */,11885 FE80DA700E9C472F000D6F75 /* JSPositionOptions.h */,11886 11812 65DF31EB09D1CC60000BE325 /* JSProcessingInstruction.cpp */, 11887 11813 65DF31EC09D1CC60000BE325 /* JSProcessingInstruction.h */, … … 12950 12876 BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */, 12951 12877 BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */, 12952 FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */,12953 FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */,12954 FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */,12955 FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */,12956 12878 51EC925B0CE90DD400F90308 /* JSCustomSQLStatementCallback.cpp */, 12957 12879 51EC925C0CE90DD400F90308 /* JSCustomSQLStatementCallback.h */, … … 12976 12898 BCEFAF4D0C317E6900FA81F6 /* JSEventCustom.cpp */, 12977 12899 BC3B7B200E91AAF400D54065 /* JSEventTargetNodeCustom.cpp */, 12978 FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */,12979 12900 BCE7B1920D4E86960075A539 /* JSHistoryCustom.cpp */, 12980 12901 BC4EDEF30C08F3FB007EDD49 /* JSHTMLAppletElementCustom.cpp */, … … 13287 13208 514B3F720C722047000530DF /* FileSystem.h */, 13288 13209 BC073BA90C399B1F000F5979 /* FloatConversion.h */, 13289 FEAB90100EA51B9C006348C3 /* GeolocationService.cpp */,13290 FEAB90110EA51B9C006348C3 /* GeolocationService.h */,13291 13210 BC3BC29B0E91AB0F00835588 /* HostWindow.h */, 13292 13211 6593923509AE4346002C531F /* KURL.cpp */, … … 16123 16042 1C81BA0E0E97348300266E07 /* JavaScriptDebugServer.h in Headers */, 16124 16043 BC3BE12B0E98092F00835588 /* PopupMenuStyle.h in Headers */, 16125 FE80D7A80E9C1ED2000D6F75 /* JSCustomPositionCallback.h in Headers */,16126 FE80D7AA0E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h in Headers */,16127 FE80D7C60E9C1F25000D6F75 /* Geolocation.h in Headers */,16128 FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */,16129 FE80D7CB0E9C1F25000D6F75 /* PositionCallback.h in Headers */,16130 FE80D7CD0E9C1F25000D6F75 /* PositionError.h in Headers */,16131 FE80D7CF0E9C1F25000D6F75 /* PositionErrorCallback.h in Headers */,16132 FE80D7D10E9C1F25000D6F75 /* PositionOptions.h in Headers */,16133 FE80DA640E9C4703000D6F75 /* JSGeolocation.h in Headers */,16134 FE80DA660E9C4703000D6F75 /* JSGeoposition.h in Headers */,16135 FE80DA720E9C472F000D6F75 /* JSPositionError.h in Headers */,16136 FE80DA740E9C472F000D6F75 /* JSPositionOptions.h in Headers */,16137 16044 BC3BE9940E9C1C7C00835588 /* RenderScrollbar.h in Headers */, 16138 16045 BC3BE9950E9C1C7C00835588 /* RenderScrollbarPart.h in Headers */, … … 16146 16053 BCE659E60EA92FB2007E4533 /* ThemeMac.h in Headers */, 16147 16054 E1C4DE690EA75C1E0023CCD6 /* ActiveDOMObject.h in Headers */, 16148 FEAB90130EA51B9C006348C3 /* GeolocationService.h in Headers */,16149 16055 BCE65BEB0EACDF16007E4533 /* Length.h in Headers */, 16150 16056 BCFF64910EAD15C200C1D6F7 /* LengthBox.h in Headers */, … … 18015 17921 1C81BA090E97348300266E07 /* JavaScriptCallFrame.cpp in Sources */, 18016 17922 1C81BA0D0E97348300266E07 /* JavaScriptDebugServer.cpp in Sources */, 18017 FE80D7A70E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp in Sources */,18018 FE80D7A90E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp in Sources */,18019 FE80D7AB0E9C1ED2000D6F75 /* JSGeolocationCustom.cpp in Sources */,18020 FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */,18021 FE80D7C80E9C1F25000D6F75 /* Geoposition.cpp in Sources */,18022 FE80DA630E9C4703000D6F75 /* JSGeolocation.cpp in Sources */,18023 FE80DA650E9C4703000D6F75 /* JSGeoposition.cpp in Sources */,18024 FE80DA710E9C472F000D6F75 /* JSPositionError.cpp in Sources */,18025 FE80DA730E9C472F000D6F75 /* JSPositionOptions.cpp in Sources */,18026 17923 BC3BE9930E9C1C7C00835588 /* RenderScrollbar.cpp in Sources */, 18027 17924 BC3BE9A50E9C239600835588 /* RenderScrollbarTheme.cpp in Sources */, … … 18032 17929 BCE659E90EA92FFA007E4533 /* ThemeMac.mm in Sources */, 18033 17930 E1C4DE6E0EA75C650023CCD6 /* ActiveDOMObject.cpp in Sources */, 18034 FEAB90120EA51B9C006348C3 /* GeolocationService.cpp in Sources */,18035 17931 BCE65BEA0EACDF16007E4533 /* Length.cpp in Sources */, 18036 17932 BCE65D320EAD1211007E4533 /* Theme.cpp in Sources */, -
trunk/WebCore/WebCoreSources.bkl
r37840 r37842 43 43 bindings/js/JSCSSStyleDeclarationCustom.cpp 44 44 bindings/js/JSCSSValueCustom.cpp 45 bindings/js/JSCustomPositionCallback.cpp46 bindings/js/JSCustomPositionErrorCallback.cpp47 45 bindings/js/JSCustomSQLStatementCallback.cpp 48 46 bindings/js/JSCustomSQLStatementErrorCallback.cpp … … 63 61 bindings/js/JSEventTarget.cpp 64 62 bindings/js/JSEventTargetNodeCustom.cpp 65 bindings/js/JSGeolocationCustom.cpp66 63 bindings/js/JSHTMLAllCollection.cpp 67 64 bindings/js/JSHistoryCustom.cpp … … 243 240 DerivedSources/WebCore/JSFile.cpp 244 241 DerivedSources/WebCore/JSFileList.cpp 245 DerivedSources/WebCore/JSGeolocation.cpp246 DerivedSources/WebCore/JSGeoposition.cpp247 242 DerivedSources/WebCore/JSHTMLAnchorElement.cpp 248 243 DerivedSources/WebCore/JSHTMLAppletElement.cpp … … 329 324 DerivedSources/WebCore/JSPlugin.cpp 330 325 DerivedSources/WebCore/JSPluginArray.cpp 331 DerivedSources/WebCore/JSPositionError.cpp332 DerivedSources/WebCore/JSPositionOptions.cpp333 326 DerivedSources/WebCore/JSProcessingInstruction.cpp 334 327 DerivedSources/WebCore/JSProgressEvent.cpp … … 678 671 page/FrameTree.cpp 679 672 page/FrameView.cpp 680 page/Geolocation.cpp681 page/Geoposition.cpp682 673 page/History.cpp 683 674 page/Location.cpp … … 703 694 platform/DragImage.cpp 704 695 platform/FileChooser.cpp 705 platform/GeolocationService.cpp706 696 platform/graphics/Font.cpp 707 697 platform/graphics/FontCache.cpp -
trunk/WebCore/bindings/js/JSDOMBinding.cpp
r37840 r37842 354 354 } 355 355 356 void markDOMObjectWrapper(JSGlobalData& globalData, void* object)357 {358 if (!object)359 return;360 DOMObject* wrapper = getCachedDOMObjectWrapper(globalData, object);361 if (!wrapper || wrapper->marked())362 return;363 wrapper->mark();364 }365 366 356 JSValuePtr jsStringOrNull(ExecState* exec, const String& s) 367 357 { -
trunk/WebCore/bindings/js/JSDOMBinding.h
r37840 r37842 70 70 void markDOMNodesForDocument(Document*); 71 71 void markActiveObjectsForDocument(JSC::JSGlobalData&, Document*); 72 void markDOMObjectWrapper(JSC::JSGlobalData& globalData, void* object);73 72 void markCrossHeapDependentObjectsForDocument(JSC::JSGlobalData&, Document*); 74 73 -
trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp
r37840 r37842 41 41 42 42 namespace WebCore { 43 44 static void markDOMObjectWrapper(JSGlobalData& globalData, void* object) 45 { 46 if (!object) 47 return; 48 DOMObject* wrapper = getCachedDOMObjectWrapper(globalData, object); 49 if (!wrapper || wrapper->marked()) 50 return; 51 wrapper->mark(); 52 } 43 53 44 54 void JSDOMWindow::mark() -
trunk/WebCore/bindings/js/JSNavigatorCustom.cpp
r37840 r37842 114 114 } 115 115 116 void JSNavigator::mark()117 {118 Base::mark();119 120 JSGlobalData& globalData = *Heap::heap(this)->globalData();121 122 markDOMObjectWrapper(globalData, impl()->optionalGeolocation());123 116 } 124 125 } -
trunk/WebCore/dom/Document.cpp
r37840 r37842 317 317 , m_hasOpenDatabases(false) 318 318 #endif 319 , m_usingGeolocation(false)320 319 #if USE(LOW_BANDWIDTH_DISPLAY) 321 320 , m_inLowBandwidthDisplay(false) -
trunk/WebCore/dom/Document.h
r37840 r37842 999 999 void stopDatabases(); 1000 1000 #endif 1001 1002 void setUsingGeolocation(bool f) { m_usingGeolocation = f; }1003 bool usingGeolocation() const { return m_usingGeolocation; };1004 1005 1001 protected: 1006 1002 void clearXMLVersion() { m_xmlVersion = String(); } … … 1079 1075 OwnPtr<DatabaseSet> m_openDatabaseSet; 1080 1076 #endif 1081 1082 bool m_usingGeolocation;1083 1077 1084 1078 #if USE(LOW_BANDWIDTH_DISPLAY) -
trunk/WebCore/loader/FrameLoader.cpp
r37840 r37842 1916 1916 && !m_frame->document()->hasOpenDatabases() 1917 1917 #endif 1918 && !m_frame->document()->usingGeolocation()1919 1918 && m_frame->page() 1920 1919 && m_frame->page()->backForwardList()->enabled() -
trunk/WebCore/page/Navigator.cpp
r37840 r37842 28 28 #include "FrameLoader.h" 29 29 #include "FrameLoaderClient.h" 30 #include "Geolocation.h"31 30 #include "Language.h" 32 31 #include "MimeTypeArray.h" … … 89 88 m_mimeTypes = 0; 90 89 } 91 if (m_geolocation) {92 m_geolocation->disconnectFrame();93 m_geolocation = 0;94 }95 90 m_frame = 0; 96 91 } … … 203 198 } 204 199 205 Geolocation* Navigator::geolocation() const206 {207 if (!m_geolocation)208 m_geolocation = Geolocation::create(m_frame);209 return m_geolocation.get();210 }211 212 200 } // namespace WebCore -
trunk/WebCore/page/Navigator.h
r37840 r37842 28 28 29 29 class Frame; 30 class Geolocation;31 30 class MimeTypeArray; 32 31 class PluginData; … … 58 57 59 58 bool onLine() const; 60 Geolocation* geolocation() const;61 // This is used for GC marking.62 Geolocation* optionalGeolocation() const { return m_geolocation.get(); }63 64 59 private: 65 60 Navigator(Frame*); … … 67 62 mutable RefPtr<PluginArray> m_plugins; 68 63 mutable RefPtr<MimeTypeArray> m_mimeTypes; 69 mutable RefPtr<Geolocation> m_geolocation;70 64 }; 71 65 -
trunk/WebCore/page/Navigator.idl
r37840 r37842 20 20 module window { 21 21 22 interface [ 23 CustomMarkFunction 24 ] Navigator { 22 interface Navigator { 25 23 readonly attribute DOMString appCodeName; 26 24 readonly attribute DOMString appName; … … 39 37 40 38 readonly attribute boolean onLine; 41 #if ENABLE_GEOLOCATION42 readonly attribute Geolocation geolocation;43 #endif44 39 }; 45 40
Note: See TracChangeset
for help on using the changeset viewer.