From 623fb8804b55710982832614a2f02e4cd15b9842 Mon Sep 17 00:00:00 2001 From: "abarth@webkit.org" Date: Wed, 22 Feb 2012 09:40:27 +0000 Subject: [PATCH] Move Geolocation code into Modules/geolocation https://bugs.webkit.org/show_bug.cgi?id=79204 Reviewed by Hajime Morita. There are still some dangling references into the Geolocation module, which I will clean up in a followup patch. * CMakeLists.txt: * DerivedSources.make: * DerivedSources.pri: * GNUmakefile.list.am: * Modules/geolocation/Geolocation.cpp: Copied from Source/WebCore/page/Geolocation.cpp. * Modules/geolocation/Geolocation.h: Copied from Source/WebCore/page/Geolocation.h. * Modules/geolocation/Geolocation.idl: Copied from Source/WebCore/page/Geolocation.idl. * Modules/geolocation/GeolocationController.cpp: Copied from Source/WebCore/page/GeolocationController.cpp. * Modules/geolocation/GeolocationController.h: Copied from Source/WebCore/page/GeolocationController.h. * Modules/geolocation/GeolocationError.h: Copied from Source/WebCore/page/GeolocationError.h. * Modules/geolocation/GeolocationPosition.h: Copied from Source/WebCore/page/GeolocationPosition.h. * Modules/geolocation/Geoposition.h: Copied from Source/WebCore/page/Geoposition.h. * Modules/geolocation/Geoposition.idl: Copied from Source/WebCore/page/Geoposition.idl. * Modules/geolocation/PositionCallback.h: Copied from Source/WebCore/page/PositionCallback.h. * Modules/geolocation/PositionCallback.idl: Copied from Source/WebCore/page/PositionCallback.idl. * Modules/geolocation/PositionError.h: Copied from Source/WebCore/page/PositionError.h. * Modules/geolocation/PositionError.idl: Copied from Source/WebCore/page/PositionError.idl. * Modules/geolocation/PositionErrorCallback.h: Copied from Source/WebCore/page/PositionErrorCallback.h. * Modules/geolocation/PositionErrorCallback.idl: Copied from Source/WebCore/page/PositionErrorCallback.idl. * Modules/geolocation/PositionOptions.h: Copied from Source/WebCore/page/PositionOptions.h. * Target.pri: * WebCore.gypi: * WebCore.vcproj/WebCore.vcproj: * WebCore.xcodeproj/project.pbxproj: * page/Geolocation.cpp: Removed. * page/Geolocation.h: Removed. * page/Geolocation.idl: Removed. * page/GeolocationController.cpp: Removed. * page/GeolocationController.h: Removed. * page/GeolocationError.h: Removed. * page/GeolocationPosition.h: Removed. * page/Geoposition.h: Removed. * page/Geoposition.idl: Removed. * 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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108464 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/CMakeLists.txt | 14 +-- Source/WebCore/ChangeLog | 51 ++++++++++ Source/WebCore/DerivedSources.make | 10 +- Source/WebCore/DerivedSources.pri | 10 +- Source/WebCore/GNUmakefile.list.am | 32 +++--- .../{page => Modules/geolocation}/Geolocation.cpp | 0 .../{page => Modules/geolocation}/Geolocation.h | 0 .../{page => Modules/geolocation}/Geolocation.idl | 0 .../geolocation}/GeolocationController.cpp | 0 .../geolocation}/GeolocationController.h | 0 .../geolocation}/GeolocationError.h | 0 .../geolocation}/GeolocationPosition.h | 0 .../{page => Modules/geolocation}/Geoposition.h | 0 .../{page => Modules/geolocation}/Geoposition.idl | 0 .../geolocation}/PositionCallback.h | 0 .../geolocation}/PositionCallback.idl | 0 .../{page => Modules/geolocation}/PositionError.h | 0 .../geolocation}/PositionError.idl | 0 .../geolocation}/PositionErrorCallback.h | 0 .../geolocation}/PositionErrorCallback.idl | 0 .../geolocation}/PositionOptions.h | 0 Source/WebCore/Target.pri | 4 +- Source/WebCore/WebCore.gypi | 32 +++--- Source/WebCore/WebCore.vcproj/WebCore.vcproj | 88 ++++++++--------- .../WebCore.vcproj/copyForwardingHeaders.cmd | 1 + Source/WebCore/WebCore.xcodeproj/project.pbxproj | 108 ++++++++++----------- 26 files changed, 201 insertions(+), 149 deletions(-) rename Source/WebCore/{page => Modules/geolocation}/Geolocation.cpp (100%) rename Source/WebCore/{page => Modules/geolocation}/Geolocation.h (100%) rename Source/WebCore/{page => Modules/geolocation}/Geolocation.idl (100%) rename Source/WebCore/{page => Modules/geolocation}/GeolocationController.cpp (100%) rename Source/WebCore/{page => Modules/geolocation}/GeolocationController.h (100%) rename Source/WebCore/{page => Modules/geolocation}/GeolocationError.h (100%) rename Source/WebCore/{page => Modules/geolocation}/GeolocationPosition.h (100%) rename Source/WebCore/{page => Modules/geolocation}/Geoposition.h (100%) rename Source/WebCore/{page => Modules/geolocation}/Geoposition.idl (100%) rename Source/WebCore/{page => Modules/geolocation}/PositionCallback.h (100%) rename Source/WebCore/{page => Modules/geolocation}/PositionCallback.idl (100%) rename Source/WebCore/{page => Modules/geolocation}/PositionError.h (100%) rename Source/WebCore/{page => Modules/geolocation}/PositionError.idl (100%) rename Source/WebCore/{page => Modules/geolocation}/PositionErrorCallback.h (100%) rename Source/WebCore/{page => Modules/geolocation}/PositionErrorCallback.idl (100%) rename Source/WebCore/{page => Modules/geolocation}/PositionOptions.h (100%) diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index bbdecfb..4f83c63 100644 --- a/Source/WebCore/CMakeLists.txt +++ b/Source/WebCore/CMakeLists.txt @@ -108,7 +108,12 @@ SET(WebCore_IDL_INCLUDES ) SET(WebCore_IDL_FILES + Modules/geolocation/Geolocation.idl + Modules/geolocation/Geoposition.idl Modules/geolocation/NavigatorGeolocation.idl + Modules/geolocation/PositionCallback.idl + Modules/geolocation/PositionError.idl + Modules/geolocation/PositionErrorCallback.idl css/Counter.idl css/CSSCharsetRule.idl @@ -333,8 +338,6 @@ SET(WebCore_IDL_FILES page/DOMSelection.idl page/DOMWindow.idl page/EventSource.idl - page/Geolocation.idl - page/Geoposition.idl page/History.idl page/Location.idl page/MemoryInfo.idl @@ -342,9 +345,6 @@ SET(WebCore_IDL_FILES page/Performance.idl page/PerformanceNavigation.idl page/PerformanceTiming.idl - page/PositionCallback.idl - page/PositionError.idl - page/PositionErrorCallback.idl page/Screen.idl page/SpeechInputEvent.idl page/SpeechInputResult.idl @@ -405,6 +405,8 @@ SET(WebCore_IDL_FILES ) SET(WebCore_SOURCES + Modules/geolocation/Geolocation.cpp + Modules/geolocation/GeolocationController.cpp Modules/geolocation/NavigatorGeolocation.cpp accessibility/AXObjectCache.cpp @@ -1021,8 +1023,6 @@ SET(WebCore_SOURCES page/FrameDestructionObserver.cpp page/FrameTree.cpp page/FrameView.cpp - page/Geolocation.cpp - page/GeolocationController.cpp page/GroupSettings.cpp page/History.cpp page/Location.cpp diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 2da1125..c04d09c 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,54 @@ +2012-02-22 Adam Barth + + Move Geolocation code into Modules/geolocation + https://bugs.webkit.org/show_bug.cgi?id=79204 + + Reviewed by Hajime Morita. + + There are still some dangling references into the Geolocation module, + which I will clean up in a followup patch. + + * CMakeLists.txt: + * DerivedSources.make: + * DerivedSources.pri: + * GNUmakefile.list.am: + * Modules/geolocation/Geolocation.cpp: Copied from Source/WebCore/page/Geolocation.cpp. + * Modules/geolocation/Geolocation.h: Copied from Source/WebCore/page/Geolocation.h. + * Modules/geolocation/Geolocation.idl: Copied from Source/WebCore/page/Geolocation.idl. + * Modules/geolocation/GeolocationController.cpp: Copied from Source/WebCore/page/GeolocationController.cpp. + * Modules/geolocation/GeolocationController.h: Copied from Source/WebCore/page/GeolocationController.h. + * Modules/geolocation/GeolocationError.h: Copied from Source/WebCore/page/GeolocationError.h. + * Modules/geolocation/GeolocationPosition.h: Copied from Source/WebCore/page/GeolocationPosition.h. + * Modules/geolocation/Geoposition.h: Copied from Source/WebCore/page/Geoposition.h. + * Modules/geolocation/Geoposition.idl: Copied from Source/WebCore/page/Geoposition.idl. + * Modules/geolocation/PositionCallback.h: Copied from Source/WebCore/page/PositionCallback.h. + * Modules/geolocation/PositionCallback.idl: Copied from Source/WebCore/page/PositionCallback.idl. + * Modules/geolocation/PositionError.h: Copied from Source/WebCore/page/PositionError.h. + * Modules/geolocation/PositionError.idl: Copied from Source/WebCore/page/PositionError.idl. + * Modules/geolocation/PositionErrorCallback.h: Copied from Source/WebCore/page/PositionErrorCallback.h. + * Modules/geolocation/PositionErrorCallback.idl: Copied from Source/WebCore/page/PositionErrorCallback.idl. + * Modules/geolocation/PositionOptions.h: Copied from Source/WebCore/page/PositionOptions.h. + * Target.pri: + * WebCore.gypi: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * page/Geolocation.cpp: Removed. + * page/Geolocation.h: Removed. + * page/Geolocation.idl: Removed. + * page/GeolocationController.cpp: Removed. + * page/GeolocationController.h: Removed. + * page/GeolocationError.h: Removed. + * page/GeolocationPosition.h: Removed. + * page/Geoposition.h: Removed. + * page/Geoposition.idl: Removed. + * 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. + 2012-02-22 Frederik Gladhorn [gtk] Accessibility: use find funtion in vector instead of for. diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make index 92ee23c..84ff67c 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make @@ -54,7 +54,12 @@ VPATH = \ # BINDING_IDLS = \ + $(WebCore)/Modules/geolocation/Geolocation.idl \ + $(WebCore)/Modules/geolocation/Geoposition.idl \ $(WebCore)/Modules/geolocation/NavigatorGeolocation.idl \ + $(WebCore)/Modules/geolocation/PositionCallback.idl \ + $(WebCore)/Modules/geolocation/PositionError.idl \ + $(WebCore)/Modules/geolocation/PositionErrorCallback.idl \ $(WebCore)/css/CSSCharsetRule.idl \ $(WebCore)/css/CSSFontFaceRule.idl \ $(WebCore)/css/CSSImportRule.idl \ @@ -319,8 +324,6 @@ BINDING_IDLS = \ $(WebCore)/page/DOMSelection.idl \ $(WebCore)/page/DOMWindow.idl \ $(WebCore)/page/EventSource.idl \ - $(WebCore)/page/Geolocation.idl \ - $(WebCore)/page/Geoposition.idl \ $(WebCore)/page/History.idl \ $(WebCore)/page/Location.idl \ $(WebCore)/page/MemoryInfo.idl \ @@ -328,9 +331,6 @@ BINDING_IDLS = \ $(WebCore)/page/Performance.idl \ $(WebCore)/page/PerformanceNavigation.idl \ $(WebCore)/page/PerformanceTiming.idl \ - $(WebCore)/page/PositionCallback.idl \ - $(WebCore)/page/PositionError.idl \ - $(WebCore)/page/PositionErrorCallback.idl \ $(WebCore)/page/Screen.idl \ $(WebCore)/page/SpeechInputEvent.idl \ $(WebCore)/page/SpeechInputResult.idl \ diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri index d6eb175..06904c6 100644 --- a/Source/WebCore/DerivedSources.pri +++ b/Source/WebCore/DerivedSources.pri @@ -86,7 +86,12 @@ STYLESHEETS_EMBED = \ $$PWD/css/mobileThemeQt.css IDL_BINDINGS += \ + $$PWD/Modules/geolocation/Geolocation.idl \ + $$PWD/Modules/geolocation/Geoposition.idl \ $$PWD/Modules/geolocation/NavigatorGeolocation.idl \ + $$PWD/Modules/geolocation/PositionCallback.idl \ + $$PWD/Modules/geolocation/PositionError.idl \ + $$PWD/Modules/geolocation/PositionErrorCallback.idl \ $$PWD/css/Counter.idl \ $$PWD/css/CSSCharsetRule.idl \ $$PWD/css/CSSFontFaceRule.idl \ @@ -343,8 +348,6 @@ IDL_BINDINGS += \ $$PWD/page/DOMSelection.idl \ $$PWD/page/DOMWindow.idl \ $$PWD/page/EventSource.idl \ - $$PWD/page/Geolocation.idl \ - $$PWD/page/Geoposition.idl \ $$PWD/page/History.idl \ $$PWD/page/Location.idl \ $$PWD/page/MemoryInfo.idl \ @@ -352,9 +355,6 @@ IDL_BINDINGS += \ $$PWD/page/Performance.idl \ $$PWD/page/PerformanceNavigation.idl \ $$PWD/page/PerformanceTiming.idl \ - $$PWD/page/PositionCallback.idl \ - $$PWD/page/PositionError.idl \ - $$PWD/page/PositionErrorCallback.idl \ $$PWD/page/Screen.idl \ $$PWD/page/SpeechInputEvent.idl \ $$PWD/page/SpeechInputResult.idl \ diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am index bde8ab4..639f1b4 100644 --- a/Source/WebCore/GNUmakefile.list.am +++ b/Source/WebCore/GNUmakefile.list.am @@ -650,7 +650,12 @@ webcore_built_sources += \ DerivedSources/WebCore/XPathGrammar.h dom_binding_idls += \ + $(WebCore)/Modules/geolocation/Geolocation.idl \ + $(WebCore)/Modules/geolocation/Geoposition.idl \ $(WebCore)/Modules/geolocation/NavigatorGeolocation.idl \ + $(WebCore)/Modules/geolocation/PositionCallback.idl \ + $(WebCore)/Modules/geolocation/PositionError.idl \ + $(WebCore)/Modules/geolocation/PositionErrorCallback.idl \ $(WebCore)/css/CSSCharsetRule.idl \ $(WebCore)/css/CSSFontFaceRule.idl \ $(WebCore)/css/CSSImportRule.idl \ @@ -898,8 +903,6 @@ dom_binding_idls += \ $(WebCore)/page/DOMSelection.idl \ $(WebCore)/page/DOMWindow.idl \ $(WebCore)/page/EventSource.idl \ - $(WebCore)/page/Geolocation.idl \ - $(WebCore)/page/Geoposition.idl \ $(WebCore)/page/History.idl \ $(WebCore)/page/Location.idl \ $(WebCore)/page/MemoryInfo.idl \ @@ -907,9 +910,6 @@ dom_binding_idls += \ $(WebCore)/page/Performance.idl \ $(WebCore)/page/PerformanceNavigation.idl \ $(WebCore)/page/PerformanceTiming.idl \ - $(WebCore)/page/PositionCallback.idl \ - $(WebCore)/page/PositionError.idl \ - $(WebCore)/page/PositionErrorCallback.idl \ $(WebCore)/page/Screen.idl \ $(WebCore)/page/SpeechInputEvent.idl \ $(WebCore)/page/SpeechInputResult.idl \ @@ -952,8 +952,19 @@ dom_binding_idls += \ $(WebCore)/xml/XSLTProcessor.idl webcore_sources += \ + Source/WebCore/Modules/geolocation/Geolocation.cpp \ + Source/WebCore/Modules/geolocation/Geolocation.h \ + Source/WebCore/Modules/geolocation/GeolocationController.cpp \ + Source/WebCore/Modules/geolocation/GeolocationController.h \ + Source/WebCore/Modules/geolocation/GeolocationError.h \ + Source/WebCore/Modules/geolocation/GeolocationPosition.h \ + Source/WebCore/Modules/geolocation/Geoposition.h \ Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp \ Source/WebCore/Modules/geolocation/NavigatorGeolocation.h \ + Source/WebCore/Modules/geolocation/PositionCallback.h \ + Source/WebCore/Modules/geolocation/PositionError.h \ + Source/WebCore/Modules/geolocation/PositionErrorCallback.h \ + Source/WebCore/Modules/geolocation/PositionOptions.h \ Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp \ Source/WebCore/accessibility/AccessibilityARIAGridCell.h \ Source/WebCore/accessibility/AccessibilityARIAGrid.cpp \ @@ -2715,14 +2726,7 @@ webcore_sources += \ Source/WebCore/page/FrameTree.h \ Source/WebCore/page/FrameView.cpp \ Source/WebCore/page/FrameView.h \ - Source/WebCore/page/Geolocation.cpp \ - Source/WebCore/page/Geolocation.h \ Source/WebCore/page/GeolocationClient.h \ - Source/WebCore/page/GeolocationController.cpp \ - Source/WebCore/page/GeolocationController.h \ - Source/WebCore/page/GeolocationError.h \ - Source/WebCore/page/GeolocationPosition.h \ - Source/WebCore/page/Geoposition.h \ Source/WebCore/page/GestureTapHighlighter.cpp \ Source/WebCore/page/GestureTapHighlighter.h \ Source/WebCore/page/GroupSettings.cpp \ @@ -2767,10 +2771,6 @@ webcore_sources += \ Source/WebCore/page/PointerLock.h \ Source/WebCore/page/PointerLockController.cpp \ Source/WebCore/page/PointerLockController.h \ - Source/WebCore/page/PositionCallback.h \ - Source/WebCore/page/PositionError.h \ - Source/WebCore/page/PositionErrorCallback.h \ - Source/WebCore/page/PositionOptions.h \ Source/WebCore/page/PrintContext.cpp \ Source/WebCore/page/PrintContext.h \ Source/WebCore/page/Screen.cpp \ diff --git a/Source/WebCore/page/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp similarity index 100% rename from Source/WebCore/page/Geolocation.cpp rename to Source/WebCore/Modules/geolocation/Geolocation.cpp diff --git a/Source/WebCore/page/Geolocation.h b/Source/WebCore/Modules/geolocation/Geolocation.h similarity index 100% rename from Source/WebCore/page/Geolocation.h rename to Source/WebCore/Modules/geolocation/Geolocation.h diff --git a/Source/WebCore/page/Geolocation.idl b/Source/WebCore/Modules/geolocation/Geolocation.idl similarity index 100% rename from Source/WebCore/page/Geolocation.idl rename to Source/WebCore/Modules/geolocation/Geolocation.idl diff --git a/Source/WebCore/page/GeolocationController.cpp b/Source/WebCore/Modules/geolocation/GeolocationController.cpp similarity index 100% rename from Source/WebCore/page/GeolocationController.cpp rename to Source/WebCore/Modules/geolocation/GeolocationController.cpp diff --git a/Source/WebCore/page/GeolocationController.h b/Source/WebCore/Modules/geolocation/GeolocationController.h similarity index 100% rename from Source/WebCore/page/GeolocationController.h rename to Source/WebCore/Modules/geolocation/GeolocationController.h diff --git a/Source/WebCore/page/GeolocationError.h b/Source/WebCore/Modules/geolocation/GeolocationError.h similarity index 100% rename from Source/WebCore/page/GeolocationError.h rename to Source/WebCore/Modules/geolocation/GeolocationError.h diff --git a/Source/WebCore/page/GeolocationPosition.h b/Source/WebCore/Modules/geolocation/GeolocationPosition.h similarity index 100% rename from Source/WebCore/page/GeolocationPosition.h rename to Source/WebCore/Modules/geolocation/GeolocationPosition.h diff --git a/Source/WebCore/page/Geoposition.h b/Source/WebCore/Modules/geolocation/Geoposition.h similarity index 100% rename from Source/WebCore/page/Geoposition.h rename to Source/WebCore/Modules/geolocation/Geoposition.h diff --git a/Source/WebCore/page/Geoposition.idl b/Source/WebCore/Modules/geolocation/Geoposition.idl similarity index 100% rename from Source/WebCore/page/Geoposition.idl rename to Source/WebCore/Modules/geolocation/Geoposition.idl diff --git a/Source/WebCore/page/PositionCallback.h b/Source/WebCore/Modules/geolocation/PositionCallback.h similarity index 100% rename from Source/WebCore/page/PositionCallback.h rename to Source/WebCore/Modules/geolocation/PositionCallback.h diff --git a/Source/WebCore/page/PositionCallback.idl b/Source/WebCore/Modules/geolocation/PositionCallback.idl similarity index 100% rename from Source/WebCore/page/PositionCallback.idl rename to Source/WebCore/Modules/geolocation/PositionCallback.idl diff --git a/Source/WebCore/page/PositionError.h b/Source/WebCore/Modules/geolocation/PositionError.h similarity index 100% rename from Source/WebCore/page/PositionError.h rename to Source/WebCore/Modules/geolocation/PositionError.h diff --git a/Source/WebCore/page/PositionError.idl b/Source/WebCore/Modules/geolocation/PositionError.idl similarity index 100% rename from Source/WebCore/page/PositionError.idl rename to Source/WebCore/Modules/geolocation/PositionError.idl diff --git a/Source/WebCore/page/PositionErrorCallback.h b/Source/WebCore/Modules/geolocation/PositionErrorCallback.h similarity index 100% rename from Source/WebCore/page/PositionErrorCallback.h rename to Source/WebCore/Modules/geolocation/PositionErrorCallback.h diff --git a/Source/WebCore/page/PositionErrorCallback.idl b/Source/WebCore/Modules/geolocation/PositionErrorCallback.idl similarity index 100% rename from Source/WebCore/page/PositionErrorCallback.idl rename to Source/WebCore/Modules/geolocation/PositionErrorCallback.idl diff --git a/Source/WebCore/page/PositionOptions.h b/Source/WebCore/Modules/geolocation/PositionOptions.h similarity index 100% rename from Source/WebCore/page/PositionOptions.h rename to Source/WebCore/Modules/geolocation/PositionOptions.h diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index 3175900..b81ec6f 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -34,6 +34,8 @@ include_webinspector { } SOURCES += \ + Modules/geolocation/Geolocation.cpp \ + Modules/geolocation/GeolocationController.cpp \ Modules/geolocation/NavigatorGeolocation.cpp \ \ accessibility/AccessibilityImageMapLink.cpp \ @@ -991,8 +993,6 @@ SOURCES += \ page/FrameDestructionObserver.cpp \ page/FrameTree.cpp \ page/FrameView.cpp \ - page/Geolocation.cpp \ - page/GeolocationController.cpp \ page/GestureTapHighlighter.cpp \ page/GroupSettings.cpp \ page/History.cpp \ diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi index 7420cc5..2cf6e5f 100644 --- a/Source/WebCore/WebCore.gypi +++ b/Source/WebCore/WebCore.gypi @@ -3,6 +3,15 @@ 'project_dir': ['.'], # These headers are part of WebCore's private API in the Apple Mac build. 'webcore_privateheader_files': [ + 'Modules/geolocation/Geolocation.h', + 'Modules/geolocation/GeolocationController.h', + 'Modules/geolocation/GeolocationError.h', + 'Modules/geolocation/GeolocationPosition.h', + 'Modules/geolocation/Geoposition.h', + 'Modules/geolocation/PositionCallback.h', + 'Modules/geolocation/PositionError.h', + 'Modules/geolocation/PositionErrorCallback.h', + 'Modules/geolocation/PositionOptions.h', 'accessibility/AXObjectCache.h', 'accessibility/AccessibilityObject.h', 'bindings/ScriptControllerBase.h', @@ -207,12 +216,7 @@ 'page/Frame.h', 'page/FrameTree.h', 'page/FrameView.h', - 'page/Geolocation.h', 'page/GeolocationClient.h', - 'page/GeolocationController.h', - 'page/GeolocationError.h', - 'page/GeolocationPosition.h', - 'page/Geoposition.h', 'page/GroupSettings.h', 'page/MediaCanStartListener.h', 'page/MemoryInfo.h', @@ -221,10 +225,6 @@ 'page/PageSerializer.h', 'page/PageSupplement.h', 'page/PageVisibilityState.h', - 'page/PositionCallback.h', - 'page/PositionError.h', - 'page/PositionErrorCallback.h', - 'page/PositionOptions.h', 'page/PrintContext.h', 'page/SecurityOrigin.h', 'page/SecurityOriginHash.h', @@ -720,7 +720,12 @@ 'Modules/gamepad/Gamepad.idl', 'Modules/gamepad/GamepadList.idl', 'Modules/gamepad/NavigatorGamepad.idl', + 'Modules/geolocation/Geolocation.idl', + 'Modules/geolocation/Geoposition.idl', 'Modules/geolocation/NavigatorGeolocation.idl', + 'Modules/geolocation/PositionCallback.idl', + 'Modules/geolocation/PositionError.idl', + 'Modules/geolocation/PositionErrorCallback.idl', 'Modules/indexeddb/DOMWindowIndexedDatabase.idl', 'Modules/intents/DOMWindowIntents.idl', 'Modules/intents/Intent.idl', @@ -1006,8 +1011,6 @@ 'page/DOMSelection.idl', 'page/DOMWindow.idl', 'page/EventSource.idl', - 'page/Geolocation.idl', - 'page/Geoposition.idl', 'page/History.idl', 'page/Location.idl', 'page/MemoryInfo.idl', @@ -1017,9 +1020,6 @@ 'page/PerformanceNavigation.idl', 'page/PerformanceTiming.idl', 'page/PointerLock.idl', - 'page/PositionCallback.idl', - 'page/PositionError.idl', - 'page/PositionErrorCallback.idl', 'page/Screen.idl', 'page/SpeechInputEvent.idl', 'page/SpeechInputResult.idl', @@ -1279,6 +1279,8 @@ 'Modules/gamepad/GamepadList.h', 'Modules/gamepad/NavigatorGamepad.cpp', 'Modules/gamepad/NavigatorGamepad.h', + 'Modules/geolocation/Geolocation.cpp', + 'Modules/geolocation/GeolocationController.cpp', 'Modules/geolocation/NavigatorGeolocation.cpp', 'Modules/geolocation/NavigatorGeolocation.h', 'Modules/indexeddb/DOMWindowIndexedDatabase.cpp', @@ -2629,8 +2631,6 @@ 'page/FrameDestructionObserver.h', 'page/FrameTree.cpp', 'page/FrameView.cpp', - 'page/Geolocation.cpp', - 'page/GeolocationController.cpp', 'page/GroupSettings.cpp', 'page/History.cpp', 'page/History.h', diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj index 827d11e..061c43f 100755 --- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj @@ -24057,6 +24057,34 @@ Name="geolocation" > + + + + + + + + + + + + + + @@ -24064,6 +24092,22 @@ RelativePath="..\Modules\geolocation\NavigatorGeolocation.h" > + + + + + + + + - - - - - - - - - - - - - - @@ -25678,22 +25694,6 @@ > - - - - - - - - diff --git a/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd b/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd index 2493473..dfd62b1 100755 --- a/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd +++ b/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd @@ -19,6 +19,7 @@ mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCoreTestSupport" xcopy /y /d "%ProjectDir%..\config.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" +xcopy /y /d "%ProjectDir%..\Modules\geolocation\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" xcopy /y /d "%ProjectDir%..\accessibility\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" xcopy /y /d "%ProjectDir%..\accessibility\win\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" xcopy /y /d "%ProjectDir%..\inspector\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj index 858d255..2b7d767 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj @@ -3343,6 +3343,17 @@ 973DC640145A9409002842C2 /* ExceptionCodeDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 973DC63E145A9409002842C2 /* ExceptionCodeDescription.h */; settings = {ATTRIBUTES = (Private, ); }; }; 973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */; }; 973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 973E325510883B7C005BC493 /* ResourceLoadNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9746AF2314F4DDE6003E7A70 /* Geolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9746AF1314F4DDE6003E7A70 /* Geolocation.cpp */; }; + 9746AF2414F4DDE6003E7A70 /* Geolocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1414F4DDE6003E7A70 /* Geolocation.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9746AF2614F4DDE6003E7A70 /* GeolocationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9746AF1614F4DDE6003E7A70 /* GeolocationController.cpp */; }; + 9746AF2714F4DDE6003E7A70 /* GeolocationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1714F4DDE6003E7A70 /* GeolocationController.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9746AF2814F4DDE6003E7A70 /* GeolocationError.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1814F4DDE6003E7A70 /* GeolocationError.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9746AF2914F4DDE6003E7A70 /* GeolocationPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1914F4DDE6003E7A70 /* GeolocationPosition.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9746AF2A14F4DDE6003E7A70 /* Geoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1A14F4DDE6003E7A70 /* Geoposition.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9746AF2C14F4DDE6003E7A70 /* PositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1C14F4DDE6003E7A70 /* PositionCallback.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9746AF2E14F4DDE6003E7A70 /* PositionError.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1E14F4DDE6003E7A70 /* PositionError.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9746AF3014F4DDE6003E7A70 /* PositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF2014F4DDE6003E7A70 /* PositionErrorCallback.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 9746AF3214F4DDE6003E7A70 /* PositionOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF2214F4DDE6003E7A70 /* PositionOptions.h */; settings = {ATTRIBUTES = (Private, ); }; }; 974A862214B7ADBB003FDC76 /* FrameDestructionObserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 974A862014B7ADBB003FDC76 /* FrameDestructionObserver.cpp */; }; 974A862314B7ADBB003FDC76 /* FrameDestructionObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 974A862114B7ADBB003FDC76 /* FrameDestructionObserver.h */; settings = {ATTRIBUTES = (Private, ); }; }; 974D2DA4146A535D00D51F8B /* SecurityPolicy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 974D2DA2146A535D00D51F8B /* SecurityPolicy.cpp */; }; @@ -5149,11 +5160,7 @@ BC53DA601143141A000D817E /* DOMObjectHashTableMap.h in Headers */ = {isa = PBXBuildFile; fileRef = BC53DA5F1143141A000D817E /* DOMObjectHashTableMap.h */; settings = {ATTRIBUTES = (Private, ); }; }; BC53DA62114314BD000D817E /* DOMObjectHashTableMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC53DA61114314BD000D817E /* DOMObjectHashTableMap.cpp */; }; BC53DAC711433064000D817E /* JSDOMWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC53DAC611433064000D817E /* JSDOMWrapper.cpp */; }; - BC56CB2110D5AC8000A77C64 /* GeolocationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC56CB1C10D5AC8000A77C64 /* GeolocationController.cpp */; }; - BC56CB2210D5AC8000A77C64 /* GeolocationController.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1D10D5AC8000A77C64 /* GeolocationController.h */; settings = {ATTRIBUTES = (Private, ); }; }; BC56CB2310D5AC8000A77C64 /* GeolocationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1E10D5AC8000A77C64 /* GeolocationClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; - BC56CB2410D5AC8000A77C64 /* GeolocationError.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1F10D5AC8000A77C64 /* GeolocationError.h */; settings = {ATTRIBUTES = (Private, ); }; }; - BC56CB2510D5AC8000A77C64 /* GeolocationPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB2010D5AC8000A77C64 /* GeolocationPosition.h */; settings = {ATTRIBUTES = (Private, ); }; }; BC5823F50C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5823F40C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp */; }; BC5825F30C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */; }; BC588AF00BFA6CF900EE679E /* HTMLParserErrorCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = BC588AEF0BFA6CF900EE679E /* HTMLParserErrorCodes.h */; }; @@ -6237,13 +6244,6 @@ FE6FD48E0F676E9300092873 /* JSCoordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD48C0F676E9300092873 /* JSCoordinates.h */; }; FE700DD10F92D81A008E2BFE /* JSCoordinatesCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */; }; FE80D7AB0E9C1ED2000D6F75 /* JSGeolocationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */; }; - FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */; }; - FE80D7C60E9C1F25000D6F75 /* Geolocation.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7B80E9C1F25000D6F75 /* Geolocation.h */; settings = {ATTRIBUTES = (Private, ); }; }; - FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */; settings = {ATTRIBUTES = (Private, ); }; }; - FE80D7CB0E9C1F25000D6F75 /* PositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */; settings = {ATTRIBUTES = (Private, ); }; }; - FE80D7CD0E9C1F25000D6F75 /* PositionError.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BF0E9C1F25000D6F75 /* PositionError.h */; settings = {ATTRIBUTES = (Private, ); }; }; - FE80D7CF0E9C1F25000D6F75 /* PositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */; settings = {ATTRIBUTES = (Private, ); }; }; - FE80D7D10E9C1F25000D6F75 /* PositionOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE80DA630E9C4703000D6F75 /* JSGeolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */; }; FE80DA640E9C4703000D6F75 /* JSGeolocation.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80DA600E9C4703000D6F75 /* JSGeolocation.h */; }; FE80DA650E9C4703000D6F75 /* JSGeoposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80DA610E9C4703000D6F75 /* JSGeoposition.cpp */; }; @@ -8516,8 +8516,6 @@ 5913A24013D49EBA00F5B05C /* IdentifiersFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IdentifiersFactory.h; sourceTree = ""; }; 59309A1011F4AE5800250603 /* DeviceOrientationClientMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DeviceOrientationClientMock.cpp; path = mock/DeviceOrientationClientMock.cpp; sourceTree = ""; }; 59309A1211F4AE6A00250603 /* DeviceOrientationClientMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeviceOrientationClientMock.h; path = mock/DeviceOrientationClientMock.h; sourceTree = ""; }; - 593AB6971355CD9200FC8211 /* PositionCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionCallback.idl; sourceTree = ""; }; - 593AB6991355CDAE00FC8211 /* PositionErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionErrorCallback.idl; sourceTree = ""; }; 5958F1CB1343917C0080B31F /* XMLViewer.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = XMLViewer.css; sourceTree = ""; }; 5958F1CC1343917C0080B31F /* XMLViewer.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = XMLViewer.js; sourceTree = ""; }; 596950811321059900C3ED18 /* JobjectWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JobjectWrapper.h; sourceTree = ""; }; @@ -10214,6 +10212,22 @@ 973DC63E145A9409002842C2 /* ExceptionCodeDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionCodeDescription.h; sourceTree = ""; }; 973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadNotifier.cpp; sourceTree = ""; }; 973E325510883B7C005BC493 /* ResourceLoadNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadNotifier.h; sourceTree = ""; }; + 9746AF1314F4DDE6003E7A70 /* Geolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Geolocation.cpp; path = Modules/geolocation/Geolocation.cpp; sourceTree = ""; }; + 9746AF1414F4DDE6003E7A70 /* Geolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Geolocation.h; path = Modules/geolocation/Geolocation.h; sourceTree = ""; }; + 9746AF1514F4DDE6003E7A70 /* Geolocation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Geolocation.idl; path = Modules/geolocation/Geolocation.idl; sourceTree = ""; }; + 9746AF1614F4DDE6003E7A70 /* GeolocationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeolocationController.cpp; path = Modules/geolocation/GeolocationController.cpp; sourceTree = ""; }; + 9746AF1714F4DDE6003E7A70 /* GeolocationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationController.h; path = Modules/geolocation/GeolocationController.h; sourceTree = ""; }; + 9746AF1814F4DDE6003E7A70 /* GeolocationError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationError.h; path = Modules/geolocation/GeolocationError.h; sourceTree = ""; }; + 9746AF1914F4DDE6003E7A70 /* GeolocationPosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationPosition.h; path = Modules/geolocation/GeolocationPosition.h; sourceTree = ""; }; + 9746AF1A14F4DDE6003E7A70 /* Geoposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Geoposition.h; path = Modules/geolocation/Geoposition.h; sourceTree = ""; }; + 9746AF1B14F4DDE6003E7A70 /* Geoposition.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Geoposition.idl; path = Modules/geolocation/Geoposition.idl; sourceTree = ""; }; + 9746AF1C14F4DDE6003E7A70 /* PositionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PositionCallback.h; path = Modules/geolocation/PositionCallback.h; sourceTree = ""; }; + 9746AF1D14F4DDE6003E7A70 /* PositionCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PositionCallback.idl; path = Modules/geolocation/PositionCallback.idl; sourceTree = ""; }; + 9746AF1E14F4DDE6003E7A70 /* PositionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PositionError.h; path = Modules/geolocation/PositionError.h; sourceTree = ""; }; + 9746AF1F14F4DDE6003E7A70 /* PositionError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PositionError.idl; path = Modules/geolocation/PositionError.idl; sourceTree = ""; }; + 9746AF2014F4DDE6003E7A70 /* PositionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PositionErrorCallback.h; path = Modules/geolocation/PositionErrorCallback.h; sourceTree = ""; }; + 9746AF2114F4DDE6003E7A70 /* PositionErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PositionErrorCallback.idl; path = Modules/geolocation/PositionErrorCallback.idl; sourceTree = ""; }; + 9746AF2214F4DDE6003E7A70 /* PositionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PositionOptions.h; path = Modules/geolocation/PositionOptions.h; sourceTree = ""; }; 974A862014B7ADBB003FDC76 /* FrameDestructionObserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameDestructionObserver.cpp; sourceTree = ""; }; 974A862114B7ADBB003FDC76 /* FrameDestructionObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameDestructionObserver.h; sourceTree = ""; }; 974D2DA2146A535D00D51F8B /* SecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecurityPolicy.cpp; sourceTree = ""; }; @@ -12083,11 +12097,7 @@ BC53DA5F1143141A000D817E /* DOMObjectHashTableMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMObjectHashTableMap.h; sourceTree = ""; }; BC53DA61114314BD000D817E /* DOMObjectHashTableMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMObjectHashTableMap.cpp; sourceTree = ""; }; BC53DAC611433064000D817E /* JSDOMWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWrapper.cpp; sourceTree = ""; }; - BC56CB1C10D5AC8000A77C64 /* GeolocationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationController.cpp; sourceTree = ""; }; - BC56CB1D10D5AC8000A77C64 /* GeolocationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationController.h; sourceTree = ""; }; BC56CB1E10D5AC8000A77C64 /* GeolocationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationClient.h; sourceTree = ""; }; - BC56CB1F10D5AC8000A77C64 /* GeolocationError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationError.h; sourceTree = ""; }; - BC56CB2010D5AC8000A77C64 /* GeolocationPosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationPosition.h; sourceTree = ""; }; BC5823F40C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLElementCustom.cpp; sourceTree = ""; }; BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSStyleDeclarationCustom.cpp; sourceTree = ""; }; BC588AEF0BFA6CF900EE679E /* HTMLParserErrorCodes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLParserErrorCodes.h; sourceTree = ""; }; @@ -13324,16 +13334,6 @@ FE6FD48C0F676E9300092873 /* JSCoordinates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCoordinates.h; sourceTree = ""; }; FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCoordinatesCustom.cpp; sourceTree = ""; }; FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeolocationCustom.cpp; sourceTree = ""; }; - FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geolocation.cpp; sourceTree = ""; }; - FE80D7B80E9C1F25000D6F75 /* Geolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geolocation.h; sourceTree = ""; }; - FE80D7B90E9C1F25000D6F75 /* Geolocation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Geolocation.idl; sourceTree = ""; }; - FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geoposition.h; sourceTree = ""; }; - FE80D7BC0E9C1F25000D6F75 /* Geoposition.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Geoposition.idl; sourceTree = ""; }; - FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionCallback.h; sourceTree = ""; }; - FE80D7BF0E9C1F25000D6F75 /* PositionError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionError.h; sourceTree = ""; }; - FE80D7C00E9C1F25000D6F75 /* PositionError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PositionError.idl; sourceTree = ""; }; - FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionErrorCallback.h; sourceTree = ""; }; - FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionOptions.h; sourceTree = ""; }; FE80DA5F0E9C4703000D6F75 /* JSGeolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeolocation.cpp; sourceTree = ""; }; FE80DA600E9C4703000D6F75 /* JSGeolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGeolocation.h; sourceTree = ""; }; FE80DA610E9C4703000D6F75 /* JSGeoposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGeoposition.cpp; sourceTree = ""; }; @@ -15258,16 +15258,7 @@ 65A21483097A3F5300B9050A /* FrameTree.h */, 65CBFEF70974F607001DAC25 /* FrameView.cpp */, 65CBFEF80974F607001DAC25 /* FrameView.h */, - FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */, - FE80D7B80E9C1F25000D6F75 /* Geolocation.h */, - FE80D7B90E9C1F25000D6F75 /* Geolocation.idl */, BC56CB1E10D5AC8000A77C64 /* GeolocationClient.h */, - BC56CB1C10D5AC8000A77C64 /* GeolocationController.cpp */, - BC56CB1D10D5AC8000A77C64 /* GeolocationController.h */, - BC56CB1F10D5AC8000A77C64 /* GeolocationError.h */, - BC56CB2010D5AC8000A77C64 /* GeolocationPosition.h */, - FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */, - FE80D7BC0E9C1F25000D6F75 /* Geoposition.idl */, C50B561412119D23008B46E0 /* GroupSettings.cpp */, C50B561512119D23008B46E0 /* GroupSettings.h */, BC94D1500C275C8B006BC617 /* History.cpp */, @@ -15315,13 +15306,6 @@ 8AF4E55811DC5A63000ED3DE /* PerformanceTiming.cpp */, 8AF4E55911DC5A63000ED3DE /* PerformanceTiming.h */, 8AF4E55A11DC5A63000ED3DE /* PerformanceTiming.idl */, - FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */, - 593AB6971355CD9200FC8211 /* PositionCallback.idl */, - FE80D7BF0E9C1F25000D6F75 /* PositionError.h */, - FE80D7C00E9C1F25000D6F75 /* PositionError.idl */, - FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */, - 593AB6991355CDAE00FC8211 /* PositionErrorCallback.idl */, - FE80D7C30E9C1F25000D6F75 /* PositionOptions.h */, B776D43C1104527500BEB0EC /* PrintContext.cpp */, B776D43A1104525D00BEB0EC /* PrintContext.h */, BCEC01BA0C274DAC009F4EC9 /* Screen.cpp */, @@ -17105,9 +17089,25 @@ 971145FF14EF007900674FD9 /* geolocation */ = { isa = PBXGroup; children = ( + 9746AF1314F4DDE6003E7A70 /* Geolocation.cpp */, + 9746AF1414F4DDE6003E7A70 /* Geolocation.h */, + 9746AF1514F4DDE6003E7A70 /* Geolocation.idl */, + 9746AF1614F4DDE6003E7A70 /* GeolocationController.cpp */, + 9746AF1714F4DDE6003E7A70 /* GeolocationController.h */, + 9746AF1814F4DDE6003E7A70 /* GeolocationError.h */, + 9746AF1914F4DDE6003E7A70 /* GeolocationPosition.h */, + 9746AF1A14F4DDE6003E7A70 /* Geoposition.h */, + 9746AF1B14F4DDE6003E7A70 /* Geoposition.idl */, 9711460014EF009A00674FD9 /* NavigatorGeolocation.cpp */, 9711460114EF009A00674FD9 /* NavigatorGeolocation.h */, 9711460214EF009A00674FD9 /* NavigatorGeolocation.idl */, + 9746AF1C14F4DDE6003E7A70 /* PositionCallback.h */, + 9746AF1D14F4DDE6003E7A70 /* PositionCallback.idl */, + 9746AF1E14F4DDE6003E7A70 /* PositionError.h */, + 9746AF1F14F4DDE6003E7A70 /* PositionError.idl */, + 9746AF2014F4DDE6003E7A70 /* PositionErrorCallback.h */, + 9746AF2114F4DDE6003E7A70 /* PositionErrorCallback.idl */, + 9746AF2214F4DDE6003E7A70 /* PositionOptions.h */, ); name = geolocation; sourceTree = ""; @@ -22392,13 +22392,13 @@ 2D481F04146B5C6B00AA7834 /* GeneratorGeneratedImage.h in Headers */, A622A8FF122C44A600A785B3 /* GenericBinding.h in Headers */, 0720B0A114D3323500642955 /* GenericEventQueue.h in Headers */, - FE80D7C60E9C1F25000D6F75 /* Geolocation.h in Headers */, + 9746AF2414F4DDE6003E7A70 /* Geolocation.h in Headers */, BC56CB2310D5AC8000A77C64 /* GeolocationClient.h in Headers */, 052BFCEB128ABF2100FD338D /* GeolocationClientMock.h in Headers */, - BC56CB2210D5AC8000A77C64 /* GeolocationController.h in Headers */, - BC56CB2410D5AC8000A77C64 /* GeolocationError.h in Headers */, - BC56CB2510D5AC8000A77C64 /* GeolocationPosition.h in Headers */, - FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */, + 9746AF2714F4DDE6003E7A70 /* GeolocationController.h in Headers */, + 9746AF2814F4DDE6003E7A70 /* GeolocationError.h in Headers */, + 9746AF2914F4DDE6003E7A70 /* GeolocationPosition.h in Headers */, + 9746AF2A14F4DDE6003E7A70 /* Geoposition.h in Headers */, 086BBD0F136039C2008B15D8 /* Glyph.h in Headers */, B2C3DA6C0D006CD600EF6F26 /* GlyphBuffer.h in Headers */, C5D4AA7A116BAFB60069CA93 /* GlyphMetricsMap.h in Headers */, @@ -23448,11 +23448,11 @@ D39D006D11F8E308006041F2 /* PopupMenuMac.h in Headers */, BC3BE12B0E98092F00835588 /* PopupMenuStyle.h in Headers */, 93F199DE08245E59001E9ABC /* Position.h in Headers */, - FE80D7CB0E9C1F25000D6F75 /* PositionCallback.h in Headers */, - FE80D7CD0E9C1F25000D6F75 /* PositionError.h in Headers */, - FE80D7CF0E9C1F25000D6F75 /* PositionErrorCallback.h in Headers */, + 9746AF2C14F4DDE6003E7A70 /* PositionCallback.h in Headers */, + 9746AF2E14F4DDE6003E7A70 /* PositionError.h in Headers */, + 9746AF3014F4DDE6003E7A70 /* PositionErrorCallback.h in Headers */, 37919C240B7D188600A56998 /* PositionIterator.h in Headers */, - FE80D7D10E9C1F25000D6F75 /* PositionOptions.h in Headers */, + 9746AF3214F4DDE6003E7A70 /* PositionOptions.h in Headers */, C0F2A44113869AAB0066C534 /* preprocessor.pm in Headers */, B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */, A8EA7EBC0A1945D000A8EF5F /* ProcessingInstruction.h in Headers */, @@ -25460,9 +25460,9 @@ 1432E8490C51493F00B1500F /* GCController.cpp in Sources */, 2D481F03146B5C6500AA7834 /* GeneratorGeneratedImage.cpp in Sources */, 0720B0A014D3323500642955 /* GenericEventQueue.cpp in Sources */, - FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */, + 9746AF2314F4DDE6003E7A70 /* Geolocation.cpp in Sources */, 052BFCE9128ABF1500FD338D /* GeolocationClientMock.cpp in Sources */, - BC56CB2110D5AC8000A77C64 /* GeolocationController.cpp in Sources */, + 9746AF2614F4DDE6003E7A70 /* GeolocationController.cpp in Sources */, B2C3DA6D0D006CD600EF6F26 /* GlyphPageTreeNode.cpp in Sources */, B2AFFC830D00A5C10030074D /* GlyphPageTreeNodeMac.cpp in Sources */, BC53C6080DA56C570021EB5D /* Gradient.cpp in Sources */, -- 2.7.4