Changeset 37842 in webkit


Ignore:
Timestamp:
Oct 24, 2008 12:39:15 AM (15 years ago)
Author:
ddkilzer@apple.com
Message:

Rolled out r37840 and r37841.

JavaScriptCore:

Rolled out r37840.

  • wtf/Platform.h:

WebCore:

Rolled out r37840 and r37841.

  • DerivedSources.make:
  • GNUmakefile.am:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • WebCoreSources.bkl:
  • bindings/js/JSCustomPositionCallback.cpp: Removed.
  • bindings/js/JSCustomPositionCallback.h: Removed.
  • bindings/js/JSCustomPositionErrorCallback.cpp: Removed.
  • bindings/js/JSCustomPositionErrorCallback.h: Removed.
  • bindings/js/JSDOMBinding.cpp:
  • bindings/js/JSDOMBinding.h:
  • bindings/js/JSDOMWindowCustom.cpp: (WebCore::markDOMObjectWrapper):
  • bindings/js/JSGeolocationCustom.cpp: Removed.
  • bindings/js/JSNavigatorCustom.cpp:
  • dom/Document.cpp: (WebCore::Document::Document):
  • dom/Document.h:
  • loader/FrameLoader.cpp: (WebCore::FrameLoader::canCachePage):
  • page/Geolocation.cpp: Removed.
  • page/Geolocation.h: Removed.
  • page/Geolocation.idl: Removed.
  • page/Geoposition.cpp: Removed.
  • page/Geoposition.h: Removed.
  • page/Geoposition.idl: Removed.
  • page/Navigator.cpp: (WebCore::Navigator::disconnectFrame):
  • page/Navigator.h:
  • page/Navigator.idl:
  • page/PositionCallback.h: Removed.
  • page/PositionCallback.idl: Removed.
  • page/PositionError.h: Removed.
  • page/PositionError.idl: Removed.
  • page/PositionErrorCallback.h: Removed.
  • page/PositionErrorCallback.idl: Removed.
  • page/PositionOptions.h: Removed.
  • page/PositionOptions.idl: Removed.
  • platform/GeolocationService.cpp: Removed.
  • platform/GeolocationService.h: Removed.

LayoutTests:

Rolled out r37840.

  • geolocation/geolocation-not-implemented-expected.txt: Removed.
  • geolocation/geolocation-not-implemented.html: Removed.
  • geolocation/geolocation-test.js: Removed.
Location:
trunk
Files:
24 deleted
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r37840 r37842  
     12008-10-24  David Kilzer  <ddkilzer@apple.com>
     2
     3        Rolled out r37840.
     4
     5        * wtf/Platform.h:
     6
    172008-10-23  Greg Bolsinga  <bolsinga@apple.com>
    28
  • trunk/JavaScriptCore/wtf/Platform.h

    r37840 r37842  
    352352#endif
    353353
    354 #if !defined(ENABLE_GEOLOCATION)
    355 #define ENABLE_GEOLOCATION 0
    356 #endif
    357 
    358354// CTI only supports x86 at the moment, and has only been tested on Mac and Windows.
    359355#if !defined(ENABLE_CTI) && PLATFORM(X86) && (PLATFORM(MAC) || PLATFORM(WIN))
  • trunk/LayoutTests/ChangeLog

    r37840 r37842  
     12008-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
    192008-10-23  Greg Bolsinga  <bolsinga@apple.com>
    210
  • trunk/WebCore/ChangeLog

    r37841 r37842  
     12008-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
    1472008-10-23  David Kilzer  <ddkilzer@apple.com>
    248
  • trunk/WebCore/DerivedSources.make

    r37840 r37842  
    9494    File \
    9595    FileList \
    96     Geolocation \
    97     Geoposition \
    9896    HTMLAnchorElement \
    9997    HTMLAppletElement \
     
    183181    Plugin \
    184182    PluginArray \
    185     PositionCallback \
    186     PositionError \
    187     PositionErrorCallback \
    188     PositionOptions \
    189183    ProcessingInstruction \
    190184    ProgressEvent \
  • trunk/WebCore/GNUmakefile.am

    r37841 r37842  
    210210        WebCore/page/DOMSelection.idl \
    211211        WebCore/page/DOMWindow.idl \
    212         WebCore/page/Geolocation.idl \
    213         WebCore/page/Geoposition.idl \
    214212        WebCore/page/History.idl \
    215213        WebCore/page/Location.idl \
    216214        WebCore/page/Navigator.idl \
    217         WebCore/page/PositionCallback.idl \
    218         WebCore/page/PositionError.idl \
    219         WebCore/page/PositionErrorCallback.idl \
    220         WebCore/page/PositionOptions.idl \
    221215        WebCore/page/Screen.idl \
    222216        WebCore/plugins/MimeType.idl \
     
    332326        WebCore/bindings/js/JSClipboardCustom.cpp \
    333327        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 \
    338328        WebCore/bindings/js/JSCustomVoidCallback.cpp \
    339329        WebCore/bindings/js/JSCustomVoidCallback.h \
     
    360350        WebCore/bindings/js/JSEventTargetBase.h \
    361351        WebCore/bindings/js/JSEventTargetNodeCustom.cpp \
    362         WebCore/bindings/js/JSGeolocationCustom.cpp \
    363352        WebCore/bindings/js/JSHTMLAllCollection.cpp \
    364353        WebCore/bindings/js/JSHTMLAllCollection.h \
     
    12021191        WebCore/page/FrameView.cpp \
    12031192        WebCore/page/FrameView.h \
    1204         WebCore/page/Geolocation.cpp \
    1205         WebCore/page/Geolocation.h \
    1206         WebCore/page/Geoposition.cpp \
    1207         WebCore/page/Geoposition.h \
    12081193        WebCore/page/History.cpp \
    12091194        WebCore/page/History.h \
     
    12181203        WebCore/page/PageGroup.cpp \
    12191204        WebCore/page/PageGroup.h \
    1220         WebCore/page/PositionCallback.h \
    1221         WebCore/page/PositionError.h \
    1222         WebCore/page/PositionErrorCallback.h \
    1223         WebCore/page/PositionOptions.h \
    12241205        WebCore/page/PrintContext.cpp \
    12251206        WebCore/page/PrintContext.h \
     
    12671248        WebCore/platform/FileSystem.h \
    12681249        WebCore/platform/FloatConversion.h \
    1269         WebCore/platform/GeolocationService.cpp \
    1270         WebCore/platform/GeolocationService.h \
    12711250        WebCore/platform/HostWindow.h \
    12721251        WebCore/platform/KURL.cpp \
  • trunk/WebCore/WebCore.pro

    r37840 r37842  
    778778    page/FrameTree.cpp \
    779779    page/FrameView.cpp \
    780     page/Geolocation.cpp \
    781     page/Geoposition.cpp \
    782780    page/History.cpp \
    783781    page/Location.cpp \
     
    807805    platform/DragImage.cpp \
    808806    platform/FileChooser.cpp \
    809     platform/GeolocationService.cpp \
    810807    platform/graphics/FontDescription.cpp \
    811808    platform/graphics/FontFamily.cpp \
     
    12031200        bindings/js/JSDatabaseCustom.cpp \
    12041201        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
    12091203
    12101204    IDL_BINDINGS += \
  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r37840 r37842  
    681681                        </File>
    682682                        <File
    683                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSGeolocation.h"
    684                                 >
    685                         </File>
    686                         <File
    687                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSGeoposition.h"
    688                                 >
    689                         </File>
    690                         <File
    691683                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSEvent.h"
    692684                                >
     
    10461038                        <File
    10471039                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNotation.h"
    1048                                 >
    1049                         </File>
    1050                         <File
    1051                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPositionError.h"
    1052                                 >
    1053                         </File>
    1054                         <File
    1055                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPositionOptions.h"
    10561040                                >
    10571041                        </File>
     
    22772261                        </File>
    22782262                        <File
    2279                                 RelativePath="..\page\Geolocation.cpp"
    2280                                 >
    2281                                 <FileConfiguration
    2282                                         Name="Release_PGO|Win32"
    2283                                         >
    2284                                         <Tool
    2285                                                 Name="VCCLCompilerTool"
    2286                                                 WholeProgramOptimization="true"
    2287                                         />
    2288                                 </FileConfiguration>
    2289                         </File>
    2290                         <File
    2291                                 RelativePath="..\page\Geolocation.h"
    2292                                 >
    2293                         </File>
    2294                         <File
    2295                                 RelativePath="..\page\Geoposition.cpp"
    2296                                 >
    2297                                 <FileConfiguration
    2298                                         Name="Release_PGO|Win32"
    2299                                         >
    2300                                         <Tool
    2301                                                 Name="VCCLCompilerTool"
    2302                                                 WholeProgramOptimization="true"
    2303                                         />
    2304                                 </FileConfiguration>
    2305                         </File>
    2306                         <File
    2307                                 RelativePath="..\page\Geoposition.h"
    2308                                 >
    2309                         </File>
    2310                         <File
    23112263                                RelativePath="..\page\History.cpp"
    23122264                                >
     
    24342386                        <File
    24352387                                RelativePath="..\page\Plugin.h"
    2436                                 >
    2437                         </File>
    2438                         <File
    2439                                 RelativePath="..\page\PositionCallback.h"
    2440                                 >
    2441                         </File>
    2442                         <File
    2443                                 RelativePath="..\page\PositionError.h"
    2444                                 >
    2445                         </File>
    2446                         <File
    2447                                 RelativePath="..\page\PositionErrorCallback.h"
    2448                                 >
    2449                         </File>
    2450                         <File
    2451                                 RelativePath="..\page\PositionOptions.h"
    24522388                                >
    24532389                        </File>
     
    31023038                        <File
    31033039                                RelativePath="..\platform\FloatConversion.h"
    3104                                 >
    3105                         </File>
    3106                         <File
    3107                                 RelativePath="..\platform\GeolocationService.cpp"
    3108                                 >
    3109                         </File>
    3110                         <File
    3111                                 RelativePath="..\platform\GeolocationService.h"
    31123040                                >
    31133041                        </File>
     
    1327413202                                </File>
    1327513203                                <File
    13276                                         RelativePath="..\bindings\js\JSCustomPositionCallback.cpp"
    13277                                         >
    13278                                 </File>
    13279                                 <File
    13280                                         RelativePath="..\bindings\js\JSCustomPositionErrorCallback.cpp"
    13281                                         >
    13282                                 </File>
    13283                                 <File
    1328413204                                        RelativePath="..\bindings\js\JSCustomSQLStatementCallback.cpp"
    1328513205                                        >
     
    1341513335                                <File
    1341613336                                        RelativePath="..\bindings\js\JSEventTargetNodeCustom.cpp"
    13417                                         >
    13418                                 </File>
    13419                                 <File
    13420                                         RelativePath="..\bindings\js\JSGeolocationCustom.cpp"
    1342113337                                        >
    1342213338                                </File>
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r37840 r37842  
    42394239                F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */; };
    42404240                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 */; };
    42644241/* End PBXBuildFile section */
    42654242
     
    88958872                F9F0ED780DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = XMLHttpRequestProgressEvent.idl; sourceTree = "<group>"; };
    88968873                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>"; };
    89268874/* End PBXFileReference section */
    89278875
     
    96769624                                65CBFEF70974F607001DAC25 /* FrameView.cpp */,
    96779625                                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 */,
    96849626                                BC94D1500C275C8B006BC617 /* History.cpp */,
    96859627                                BC94D1510C275C8B006BC617 /* History.h */,
     
    96979639                                9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */,
    96989640                                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 */,
    97079641                                BCEC01BA0C274DAC009F4EC9 /* Screen.cpp */,
    97089642                                BCEC01BB0C274DAC009F4EC9 /* Screen.h */,
     
    1186811802                                93F9B7720BA5FDDC00854064 /* JSEntityReference.cpp */,
    1186911803                                93F9B7730BA5FDDC00854064 /* JSEntityReference.h */,
    11870                                 FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */,
    11871                                 FE80DA600E9C4703000D6F75 /* JSGeolocation.h */,
    11872                                 FE80DA610E9C4703000D6F75 /* JSGeoposition.cpp */,
    11873                                 FE80DA620E9C4703000D6F75 /* JSGeoposition.h */,
    1187411804                                BCD9C2BC0C17B69E005C90A2 /* JSNamedNodeMap.cpp */,
    1187511805                                BCD9C2BD0C17B69E005C90A2 /* JSNamedNodeMap.h */,
     
    1188011810                                65DF31E909D1CC60000BE325 /* JSNotation.cpp */,
    1188111811                                65DF31EA09D1CC60000BE325 /* JSNotation.h */,
    11882                                 FE80DA6D0E9C472F000D6F75 /* JSPositionError.cpp */,
    11883                                 FE80DA6E0E9C472F000D6F75 /* JSPositionError.h */,
    11884                                 FE80DA6F0E9C472F000D6F75 /* JSPositionOptions.cpp */,
    11885                                 FE80DA700E9C472F000D6F75 /* JSPositionOptions.h */,
    1188611812                                65DF31EB09D1CC60000BE325 /* JSProcessingInstruction.cpp */,
    1188711813                                65DF31EC09D1CC60000BE325 /* JSProcessingInstruction.h */,
     
    1295012876                                BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */,
    1295112877                                BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */,
    12952                                 FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */,
    12953                                 FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */,
    12954                                 FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */,
    12955                                 FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */,
    1295612878                                51EC925B0CE90DD400F90308 /* JSCustomSQLStatementCallback.cpp */,
    1295712879                                51EC925C0CE90DD400F90308 /* JSCustomSQLStatementCallback.h */,
     
    1297612898                                BCEFAF4D0C317E6900FA81F6 /* JSEventCustom.cpp */,
    1297712899                                BC3B7B200E91AAF400D54065 /* JSEventTargetNodeCustom.cpp */,
    12978                                 FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */,
    1297912900                                BCE7B1920D4E86960075A539 /* JSHistoryCustom.cpp */,
    1298012901                                BC4EDEF30C08F3FB007EDD49 /* JSHTMLAppletElementCustom.cpp */,
     
    1328713208                                514B3F720C722047000530DF /* FileSystem.h */,
    1328813209                                BC073BA90C399B1F000F5979 /* FloatConversion.h */,
    13289                                 FEAB90100EA51B9C006348C3 /* GeolocationService.cpp */,
    13290                                 FEAB90110EA51B9C006348C3 /* GeolocationService.h */,
    1329113210                                BC3BC29B0E91AB0F00835588 /* HostWindow.h */,
    1329213211                                6593923509AE4346002C531F /* KURL.cpp */,
     
    1612316042                                1C81BA0E0E97348300266E07 /* JavaScriptDebugServer.h in Headers */,
    1612416043                                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 */,
    1613716044                                BC3BE9940E9C1C7C00835588 /* RenderScrollbar.h in Headers */,
    1613816045                                BC3BE9950E9C1C7C00835588 /* RenderScrollbarPart.h in Headers */,
     
    1614616053                                BCE659E60EA92FB2007E4533 /* ThemeMac.h in Headers */,
    1614716054                                E1C4DE690EA75C1E0023CCD6 /* ActiveDOMObject.h in Headers */,
    16148                                 FEAB90130EA51B9C006348C3 /* GeolocationService.h in Headers */,
    1614916055                                BCE65BEB0EACDF16007E4533 /* Length.h in Headers */,
    1615016056                                BCFF64910EAD15C200C1D6F7 /* LengthBox.h in Headers */,
     
    1801517921                                1C81BA090E97348300266E07 /* JavaScriptCallFrame.cpp in Sources */,
    1801617922                                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 */,
    1802617923                                BC3BE9930E9C1C7C00835588 /* RenderScrollbar.cpp in Sources */,
    1802717924                                BC3BE9A50E9C239600835588 /* RenderScrollbarTheme.cpp in Sources */,
     
    1803217929                                BCE659E90EA92FFA007E4533 /* ThemeMac.mm in Sources */,
    1803317930                                E1C4DE6E0EA75C650023CCD6 /* ActiveDOMObject.cpp in Sources */,
    18034                                 FEAB90120EA51B9C006348C3 /* GeolocationService.cpp in Sources */,
    1803517931                                BCE65BEA0EACDF16007E4533 /* Length.cpp in Sources */,
    1803617932                                BCE65D320EAD1211007E4533 /* Theme.cpp in Sources */,
  • trunk/WebCore/WebCoreSources.bkl

    r37840 r37842  
    4343        bindings/js/JSCSSStyleDeclarationCustom.cpp
    4444        bindings/js/JSCSSValueCustom.cpp
    45         bindings/js/JSCustomPositionCallback.cpp
    46         bindings/js/JSCustomPositionErrorCallback.cpp
    4745        bindings/js/JSCustomSQLStatementCallback.cpp
    4846        bindings/js/JSCustomSQLStatementErrorCallback.cpp
     
    6361        bindings/js/JSEventTarget.cpp
    6462        bindings/js/JSEventTargetNodeCustom.cpp
    65         bindings/js/JSGeolocationCustom.cpp
    6663        bindings/js/JSHTMLAllCollection.cpp
    6764        bindings/js/JSHistoryCustom.cpp
     
    243240        DerivedSources/WebCore/JSFile.cpp
    244241        DerivedSources/WebCore/JSFileList.cpp
    245         DerivedSources/WebCore/JSGeolocation.cpp
    246         DerivedSources/WebCore/JSGeoposition.cpp
    247242        DerivedSources/WebCore/JSHTMLAnchorElement.cpp
    248243        DerivedSources/WebCore/JSHTMLAppletElement.cpp
     
    329324        DerivedSources/WebCore/JSPlugin.cpp
    330325        DerivedSources/WebCore/JSPluginArray.cpp
    331         DerivedSources/WebCore/JSPositionError.cpp
    332         DerivedSources/WebCore/JSPositionOptions.cpp
    333326        DerivedSources/WebCore/JSProcessingInstruction.cpp
    334327        DerivedSources/WebCore/JSProgressEvent.cpp
     
    678671        page/FrameTree.cpp
    679672        page/FrameView.cpp
    680         page/Geolocation.cpp
    681         page/Geoposition.cpp
    682673        page/History.cpp
    683674        page/Location.cpp
     
    703694        platform/DragImage.cpp
    704695        platform/FileChooser.cpp
    705         platform/GeolocationService.cpp
    706696        platform/graphics/Font.cpp
    707697        platform/graphics/FontCache.cpp
  • trunk/WebCore/bindings/js/JSDOMBinding.cpp

    r37840 r37842  
    354354}
    355355
    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 
    366356JSValuePtr jsStringOrNull(ExecState* exec, const String& s)
    367357{
  • trunk/WebCore/bindings/js/JSDOMBinding.h

    r37840 r37842  
    7070    void markDOMNodesForDocument(Document*);
    7171    void markActiveObjectsForDocument(JSC::JSGlobalData&, Document*);
    72     void markDOMObjectWrapper(JSC::JSGlobalData& globalData, void* object);
    7372    void markCrossHeapDependentObjectsForDocument(JSC::JSGlobalData&, Document*);
    7473
  • trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

    r37840 r37842  
    4141
    4242namespace WebCore {
     43
     44static 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}
    4353
    4454void JSDOMWindow::mark()
  • trunk/WebCore/bindings/js/JSNavigatorCustom.cpp

    r37840 r37842  
    114114}
    115115
    116 void JSNavigator::mark()
    117 {
    118     Base::mark();
    119 
    120     JSGlobalData& globalData = *Heap::heap(this)->globalData();
    121 
    122     markDOMObjectWrapper(globalData, impl()->optionalGeolocation());
    123116}
    124 
    125 }
  • trunk/WebCore/dom/Document.cpp

    r37840 r37842  
    317317    , m_hasOpenDatabases(false)
    318318#endif
    319     , m_usingGeolocation(false)
    320319#if USE(LOW_BANDWIDTH_DISPLAY)
    321320    , m_inLowBandwidthDisplay(false)
  • trunk/WebCore/dom/Document.h

    r37840 r37842  
    999999    void stopDatabases();
    10001000#endif
    1001    
    1002     void setUsingGeolocation(bool f) { m_usingGeolocation = f; }
    1003     bool usingGeolocation() const { return m_usingGeolocation; };
    1004    
    10051001protected:
    10061002    void clearXMLVersion() { m_xmlVersion = String(); }
     
    10791075    OwnPtr<DatabaseSet> m_openDatabaseSet;
    10801076#endif
    1081    
    1082     bool m_usingGeolocation;
    10831077
    10841078#if USE(LOW_BANDWIDTH_DISPLAY)
  • trunk/WebCore/loader/FrameLoader.cpp

    r37840 r37842  
    19161916        && !m_frame->document()->hasOpenDatabases()
    19171917#endif
    1918         && !m_frame->document()->usingGeolocation()
    19191918        && m_frame->page()
    19201919        && m_frame->page()->backForwardList()->enabled()
  • trunk/WebCore/page/Navigator.cpp

    r37840 r37842  
    2828#include "FrameLoader.h"
    2929#include "FrameLoaderClient.h"
    30 #include "Geolocation.h"
    3130#include "Language.h"
    3231#include "MimeTypeArray.h"
     
    8988        m_mimeTypes = 0;
    9089    }
    91     if (m_geolocation) {
    92         m_geolocation->disconnectFrame();
    93         m_geolocation = 0;
    94     }
    9590    m_frame = 0;
    9691}
     
    203198}
    204199
    205 Geolocation* Navigator::geolocation() const
    206 {
    207     if (!m_geolocation)
    208         m_geolocation = Geolocation::create(m_frame);
    209     return m_geolocation.get();
    210 }
    211    
    212200} // namespace WebCore
  • trunk/WebCore/page/Navigator.h

    r37840 r37842  
    2828
    2929    class Frame;
    30     class Geolocation;
    3130    class MimeTypeArray;
    3231    class PluginData;
     
    5857
    5958        bool onLine() const;
    60         Geolocation* geolocation() const;
    61         // This is used for GC marking.
    62         Geolocation* optionalGeolocation() const { return m_geolocation.get(); }
    63 
    6459    private:
    6560        Navigator(Frame*);
     
    6762        mutable RefPtr<PluginArray> m_plugins;
    6863        mutable RefPtr<MimeTypeArray> m_mimeTypes;
    69         mutable RefPtr<Geolocation> m_geolocation;
    7064    };
    7165
  • trunk/WebCore/page/Navigator.idl

    r37840 r37842  
    2020module window {
    2121
    22     interface [
    23         CustomMarkFunction
    24     ] Navigator {
     22    interface Navigator {
    2523        readonly attribute DOMString appCodeName;
    2624        readonly attribute DOMString appName;
     
    3937       
    4038        readonly attribute boolean onLine;
    41 #if ENABLE_GEOLOCATION
    42         readonly attribute Geolocation geolocation;
    43 #endif
    4439    };
    4540
Note: See TracChangeset for help on using the changeset viewer.