Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (146569 => 146570)
--- trunk/Source/WebCore/CMakeLists.txt 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-03-22 07:52:09 UTC (rev 146570)
@@ -179,6 +179,7 @@
Modules/gamepad/GamepadList.idl
Modules/gamepad/NavigatorGamepad.idl
+ Modules/geolocation/Coordinates.idl
Modules/geolocation/Geolocation.idl
Modules/geolocation/Geoposition.idl
Modules/geolocation/NavigatorGeolocation.idl
@@ -563,7 +564,6 @@
page/BarInfo.idl
page/Console.idl
- page/Coordinates.idl
page/Crypto.idl
page/DOMSecurityPolicy.idl
page/DOMSelection.idl
Modified: trunk/Source/WebCore/ChangeLog (146569 => 146570)
--- trunk/Source/WebCore/ChangeLog 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/ChangeLog 2013-03-22 07:52:09 UTC (rev 146570)
@@ -1,3 +1,41 @@
+2013-03-22 Steve Block <[email protected]>
+
+ Move page/Coordinates.[h|idl] to Modules/geolocation/
+ https://bugs.webkit.org/show_bug.cgi?id=112945
+
+ Reviewed by Kentaro Hara.
+
+ No new tests, no functional change.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * Modules/geolocation/Coordinates.h: Renamed from Source/WebCore/page/Coordinates.h.
+ (WebCore):
+ (Coordinates):
+ (WebCore::Coordinates::create):
+ (WebCore::Coordinates::isolatedCopy):
+ (WebCore::Coordinates::latitude):
+ (WebCore::Coordinates::longitude):
+ (WebCore::Coordinates::altitude):
+ (WebCore::Coordinates::accuracy):
+ (WebCore::Coordinates::altitudeAccuracy):
+ (WebCore::Coordinates::heading):
+ (WebCore::Coordinates::speed):
+ (WebCore::Coordinates::canProvideAltitude):
+ (WebCore::Coordinates::canProvideAltitudeAccuracy):
+ (WebCore::Coordinates::canProvideHeading):
+ (WebCore::Coordinates::canProvideSpeed):
+ (WebCore::Coordinates::Coordinates):
+ * Modules/geolocation/Coordinates.idl: Renamed from Source/WebCore/page/Coordinates.idl.
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+
2013-03-21 Hajime Morrita <[email protected]>
Custom Elements: "readyCallback" lifecycle callback should be called.
Modified: trunk/Source/WebCore/DerivedSources.make (146569 => 146570)
--- trunk/Source/WebCore/DerivedSources.make 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/DerivedSources.make 2013-03-22 07:52:09 UTC (rev 146570)
@@ -91,6 +91,7 @@
$(WebCore)/Modules/filesystem/Metadata.idl \
$(WebCore)/Modules/filesystem/MetadataCallback.idl \
$(WebCore)/Modules/filesystem/WorkerContextFileSystem.idl \
+ $(WebCore)/Modules/geolocation/Coordinates.idl \
$(WebCore)/Modules/geolocation/Geolocation.idl \
$(WebCore)/Modules/geolocation/Geoposition.idl \
$(WebCore)/Modules/geolocation/NavigatorGeolocation.idl \
@@ -441,7 +442,6 @@
$(WebCore)/page/AbstractView.idl \
$(WebCore)/page/BarInfo.idl \
$(WebCore)/page/Console.idl \
- $(WebCore)/page/Coordinates.idl \
$(WebCore)/page/Crypto.idl \
$(WebCore)/page/DOMSecurityPolicy.idl \
$(WebCore)/page/DOMSelection.idl \
Modified: trunk/Source/WebCore/DerivedSources.pri (146569 => 146570)
--- trunk/Source/WebCore/DerivedSources.pri 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/DerivedSources.pri 2013-03-22 07:52:09 UTC (rev 146570)
@@ -110,6 +110,7 @@
$$PWD/Modules/filesystem/Metadata.idl \
$$PWD/Modules/filesystem/MetadataCallback.idl \
$$PWD/Modules/filesystem/WorkerContextFileSystem.idl \
+ $$PWD/Modules/geolocation/Coordinates.idl \
$$PWD/Modules/geolocation/Geolocation.idl \
$$PWD/Modules/geolocation/Geoposition.idl \
$$PWD/Modules/geolocation/NavigatorGeolocation.idl \
@@ -441,7 +442,6 @@
$$PWD/loader/appcache/DOMApplicationCache.idl \
$$PWD/page/BarInfo.idl \
$$PWD/page/Console.idl \
- $$PWD/page/Coordinates.idl \
$$PWD/page/Crypto.idl \
$$PWD/page/DOMSecurityPolicy.idl \
$$PWD/page/DOMSelection.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (146569 => 146570)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-03-22 07:52:09 UTC (rev 146570)
@@ -1227,6 +1227,7 @@
$(WebCore)/Modules/gamepad/Gamepad.idl \
$(WebCore)/Modules/gamepad/GamepadList.idl \
$(WebCore)/Modules/gamepad/NavigatorGamepad.idl \
+ $(WebCore)/Modules/geolocation/Coordinates.idl \
$(WebCore)/Modules/geolocation/Geolocation.idl \
$(WebCore)/Modules/geolocation/Geoposition.idl \
$(WebCore)/Modules/geolocation/NavigatorGeolocation.idl \
@@ -1594,7 +1595,6 @@
$(WebCore)/loader/appcache/DOMApplicationCache.idl \
$(WebCore)/page/BarInfo.idl \
$(WebCore)/page/Console.idl \
- $(WebCore)/page/Coordinates.idl \
$(WebCore)/page/Crypto.idl \
$(WebCore)/page/DOMSecurityPolicy.idl \
$(WebCore)/page/DOMSelection.idl \
@@ -1856,6 +1856,7 @@
Source/WebCore/Modules/gamepad/GamepadList.h \
Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp \
Source/WebCore/Modules/gamepad/NavigatorGamepad.h \
+ Source/WebCore/Modules/geolocation/Coordinates.h \
Source/WebCore/Modules/geolocation/Geolocation.cpp \
Source/WebCore/Modules/geolocation/Geolocation.h \
Source/WebCore/Modules/geolocation/GeolocationController.cpp \
@@ -4164,7 +4165,6 @@
Source/WebCore/page/ContextMenuController.cpp \
Source/WebCore/page/ContextMenuController.h \
Source/WebCore/page/ContextMenuProvider.h \
- Source/WebCore/page/Coordinates.h \
Source/WebCore/page/Crypto.cpp \
Source/WebCore/page/Crypto.h \
Source/WebCore/page/DeviceClient.h \
Copied: trunk/Source/WebCore/Modules/geolocation/Coordinates.h (from rev 146569, trunk/Source/WebCore/page/Coordinates.h) (0 => 146570)
--- trunk/Source/WebCore/Modules/geolocation/Coordinates.h (rev 0)
+++ trunk/Source/WebCore/Modules/geolocation/Coordinates.h 2013-03-22 07:52:09 UTC (rev 146570)
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef Coordinates_h
+#define Coordinates_h
+
+#include "Event.h"
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class Coordinates : public RefCounted<Coordinates> {
+public:
+ static PassRefPtr<Coordinates> create(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed) { return adoptRef(new Coordinates(latitude, longitude, providesAltitude, altitude, accuracy, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed)); }
+
+ PassRefPtr<Coordinates> isolatedCopy() const
+ {
+ return Coordinates::create(m_latitude, m_longitude, m_canProvideAltitude, m_altitude, m_accuracy, m_canProvideAltitudeAccuracy, m_altitudeAccuracy, m_canProvideHeading, m_heading, m_canProvideSpeed, m_speed);
+ }
+
+ double latitude() const { return m_latitude; }
+ double longitude() const { return m_longitude; }
+ double altitude() const { return m_altitude; }
+ double accuracy() const { return m_accuracy; }
+ double altitudeAccuracy() const { return m_altitudeAccuracy; }
+ double heading() const { return m_heading; }
+ double speed() const { return m_speed; }
+
+ bool canProvideAltitude() const { return m_canProvideAltitude; }
+ bool canProvideAltitudeAccuracy() const { return m_canProvideAltitudeAccuracy; }
+ bool canProvideHeading() const { return m_canProvideHeading; }
+ bool canProvideSpeed() const { return m_canProvideSpeed; }
+
+private:
+ Coordinates(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed)
+ : m_latitude(latitude)
+ , m_longitude(longitude)
+ , m_altitude(altitude)
+ , m_accuracy(accuracy)
+ , m_altitudeAccuracy(altitudeAccuracy)
+ , m_heading(heading)
+ , m_speed(speed)
+ , m_canProvideAltitude(providesAltitude)
+ , m_canProvideAltitudeAccuracy(providesAltitudeAccuracy)
+ , m_canProvideHeading(providesHeading)
+ , m_canProvideSpeed(providesSpeed)
+ {
+ }
+
+ double m_latitude;
+ double m_longitude;
+ double m_altitude;
+ double m_accuracy;
+ double m_altitudeAccuracy;
+ double m_heading;
+ double m_speed;
+
+ bool m_canProvideAltitude;
+ bool m_canProvideAltitudeAccuracy;
+ bool m_canProvideHeading;
+ bool m_canProvideSpeed;
+};
+
+} // namespace WebCore
+
+#endif // Coordinates_h
Copied: trunk/Source/WebCore/Modules/geolocation/Coordinates.idl (from rev 146569, trunk/Source/WebCore/page/Coordinates.idl) (0 => 146570)
--- trunk/Source/WebCore/Modules/geolocation/Coordinates.idl (rev 0)
+++ trunk/Source/WebCore/Modules/geolocation/Coordinates.idl 2013-03-22 07:52:09 UTC (rev 146570)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ OmitConstructor,
+ ImplementationLacksVTable
+] interface Coordinates {
+ readonly attribute double latitude;
+ readonly attribute double longitude;
+ [Custom] readonly attribute double altitude;
+ readonly attribute double accuracy;
+ [Custom] readonly attribute double altitudeAccuracy;
+ [Custom] readonly attribute double heading;
+ [Custom] readonly attribute double speed;
+};
Modified: trunk/Source/WebCore/Target.pri (146569 => 146570)
--- trunk/Source/WebCore/Target.pri 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/Target.pri 2013-03-22 07:52:09 UTC (rev 146570)
@@ -1447,6 +1447,7 @@
plugins/npruntime.h
HEADERS += \
+ Modules/geolocation/Coordinates.h \
Modules/geolocation/Geolocation.h \
Modules/geolocation/GeolocationController.h \
Modules/geolocation/GeolocationError.h \
@@ -2118,7 +2119,6 @@
page/ConsoleTypes.h \
page/ContextMenuController.h \
page/ContextMenuProvider.h \
- page/Coordinates.h \
page/DeviceClient.h \
page/DeviceController.h \
page/DiagnosticLoggingKeys.h \
Modified: trunk/Source/WebCore/WebCore.gypi (146569 => 146570)
--- trunk/Source/WebCore/WebCore.gypi 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/WebCore.gypi 2013-03-22 07:52:09 UTC (rev 146570)
@@ -120,6 +120,7 @@
'Modules/gamepad/Gamepad.idl',
'Modules/gamepad/GamepadList.idl',
'Modules/gamepad/NavigatorGamepad.idl',
+ 'Modules/geolocation/Coordinates.idl',
'Modules/geolocation/Geolocation.idl',
'Modules/geolocation/Geoposition.idl',
'Modules/geolocation/NavigatorGeolocation.idl',
@@ -511,7 +512,6 @@
'page/AbstractView.idl',
'page/BarInfo.idl',
'page/Console.idl',
- 'page/Coordinates.idl',
'page/Crypto.idl',
'page/DOMSecurityPolicy.idl',
'page/DOMSelection.idl',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (146569 => 146570)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-03-22 07:52:09 UTC (rev 146570)
@@ -25178,6 +25178,10 @@
Name="geolocation"
>
<File
+ RelativePath="..\Modules\geolocation\Coordinates.h"
+ >
+ </File>
+ <File
RelativePath="..\Modules\geolocation\Geolocation.cpp"
>
</File>
@@ -27375,10 +27379,6 @@
>
</File>
<File
- RelativePath="..\page\Coordinates.h"
- >
- </File>
- <File
RelativePath="..\page\Crypto.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (146569 => 146570)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-22 07:52:09 UTC (rev 146570)
@@ -11233,6 +11233,7 @@
<ClInclude Include="..\Modules\filesystem\MetadataCallback.h" />
<ClInclude Include="..\Modules\filesystem\SyncCallbackHelper.h" />
<ClInclude Include="..\Modules\filesystem\WorkerContextFileSystem.h" />
+ <ClInclude Include="..\Modules\geolocation\Coordinates.h" />
<ClInclude Include="..\Modules\geolocation\Geolocation.h" />
<ClInclude Include="..\Modules\geolocation\GeolocationController.h" />
<ClInclude Include="..\Modules\geolocation\GeolocationError.h" />
@@ -11396,7 +11397,6 @@
<ClInclude Include="..\page\ContextMenuClient.h" />
<ClInclude Include="..\page\ContextMenuController.h" />
<ClInclude Include="..\page\ContextMenuProvider.h" />
- <ClInclude Include="..\page\Coordinates.h" />
<ClInclude Include="..\page\Crypto.h" />
<ClInclude Include="..\page\animation\CSSPropertyAnimation.h" />
<ClInclude Include="..\page\DeviceClient.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (146569 => 146570)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-22 07:52:09 UTC (rev 146570)
@@ -8367,6 +8367,9 @@
<ClInclude Include="..\Modules\filesystem\WorkerContextFileSystem.h">
<Filter>Modules\filesystem</Filter>
</ClInclude>
+ <ClInclude Include="..\Modules\geolocation\Coordinates.h">
+ <Filter>Modules\geolocation</Filter>
+ </ClInclude>
<ClInclude Include="..\Modules\geolocation\Geolocation.h">
<Filter>Modules\geolocation</Filter>
</ClInclude>
@@ -8838,9 +8841,6 @@
<ClInclude Include="..\page\ContextMenuProvider.h">
<Filter>page</Filter>
</ClInclude>
- <ClInclude Include="..\page\Coordinates.h">
- <Filter>page</Filter>
- </ClInclude>
<ClInclude Include="..\page\Crypto.h">
<Filter>page</Filter>
</ClInclude>
@@ -15345,4 +15345,4 @@
<Filter>rendering</Filter>
</CustomBuildStep>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (146569 => 146570)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-03-22 07:52:09 UTC (rev 146570)
@@ -3578,6 +3578,7 @@
973F418B169B96030006BF60 /* HTMLParserOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 973F4187169B95EF0006BF60 /* HTMLParserOptions.cpp */; };
974187D316A7932700FA77A7 /* HTMLParserThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 974187D016A7932200FA77A7 /* HTMLParserThread.cpp */; };
974187D416A7932900FA77A7 /* HTMLParserThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 974187D116A7932200FA77A7 /* HTMLParserThread.h */; };
+ 9746AF2114F4DDE6003E7A71 /* Coordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1114F4DDE6003E7A70 /* Coordinates.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 */; };
@@ -6821,7 +6822,6 @@
FE4AADEF16D2C37400026FFC /* AbstractSQLStatementBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = FE4AADED16D2C37400026FFC /* AbstractSQLStatementBackend.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6F6AAF169E057500FC30A2 /* DatabaseBackendContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE6F6AAD169E057500FC30A2 /* DatabaseBackendContext.cpp */; };
FE6F6AB0169E057500FC30A2 /* DatabaseBackendContext.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6F6AAE169E057500FC30A2 /* DatabaseBackendContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
- FE6FD4880F676E5700092873 /* Coordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD4850F676E5700092873 /* Coordinates.h */; settings = {ATTRIBUTES = (Private, ); }; };
FE6FD48D0F676E9300092873 /* JSCoordinates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE6FD48B0F676E9300092873 /* JSCoordinates.cpp */; };
FE6FD48E0F676E9300092873 /* JSCoordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD48C0F676E9300092873 /* JSCoordinates.h */; };
FE700DD10F92D81A008E2BFE /* JSCoordinatesCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */; };
@@ -11092,6 +11092,8 @@
973F4188169B95EF0006BF60 /* HTMLParserOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLParserOptions.h; path = parser/HTMLParserOptions.h; sourceTree = "<group>"; };
974187D016A7932200FA77A7 /* HTMLParserThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLParserThread.cpp; path = parser/HTMLParserThread.cpp; sourceTree = "<group>"; };
974187D116A7932200FA77A7 /* HTMLParserThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLParserThread.h; path = parser/HTMLParserThread.h; sourceTree = "<group>"; };
+ 9746AF1114F4DDE6003E7A70 /* Coordinates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Coordinates.h; path = Modules/geolocation/Coordinates.h; sourceTree = "<group>"; };
+ 9746AF1214F4DDE6003E7A70 /* Coordinates.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Coordinates.idl; path = Modules/geolocation/Coordinates.idl; sourceTree = "<group>"; };
9746AF1314F4DDE6003E7A70 /* Geolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Geolocation.cpp; path = Modules/geolocation/Geolocation.cpp; sourceTree = "<group>"; };
9746AF1414F4DDE6003E7A70 /* Geolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Geolocation.h; path = Modules/geolocation/Geolocation.h; sourceTree = "<group>"; };
9746AF1514F4DDE6003E7A70 /* Geolocation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Geolocation.idl; path = Modules/geolocation/Geolocation.idl; sourceTree = "<group>"; };
@@ -14634,8 +14636,6 @@
FE4AADED16D2C37400026FFC /* AbstractSQLStatementBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AbstractSQLStatementBackend.h; path = Modules/webdatabase/AbstractSQLStatementBackend.h; sourceTree = "<group>"; };
FE6F6AAD169E057500FC30A2 /* DatabaseBackendContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseBackendContext.cpp; path = Modules/webdatabase/DatabaseBackendContext.cpp; sourceTree = "<group>"; };
FE6F6AAE169E057500FC30A2 /* DatabaseBackendContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseBackendContext.h; path = Modules/webdatabase/DatabaseBackendContext.h; sourceTree = "<group>"; };
- FE6FD4850F676E5700092873 /* Coordinates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Coordinates.h; sourceTree = "<group>"; };
- FE6FD4860F676E5700092873 /* Coordinates.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Coordinates.idl; sourceTree = "<group>"; };
FE6FD48B0F676E9300092873 /* JSCoordinates.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCoordinates.cpp; sourceTree = "<group>"; };
FE6FD48C0F676E9300092873 /* JSCoordinates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCoordinates.h; sourceTree = "<group>"; };
FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCoordinatesCustom.cpp; sourceTree = "<group>"; };
@@ -16476,8 +16476,6 @@
065AD4F30B0C2EDA005A2B1D /* ContextMenuController.cpp */,
065AD4F40B0C2EDA005A2B1D /* ContextMenuController.h */,
7ADE722510CBBB9B006B3B3A /* ContextMenuProvider.h */,
- FE6FD4850F676E5700092873 /* Coordinates.h */,
- FE6FD4860F676E5700092873 /* Coordinates.idl */,
975CA287130365F800E99AD9 /* Crypto.cpp */,
975CA288130365F800E99AD9 /* Crypto.h */,
975CA289130365F800E99AD9 /* Crypto.idl */,
@@ -18511,6 +18509,8 @@
971145FF14EF007900674FD9 /* geolocation */ = {
isa = PBXGroup;
children = (
+ 9746AF1114F4DDE6003E7A70 /* Coordinates.h */,
+ 9746AF1214F4DDE6003E7A70 /* Coordinates.idl */,
9746AF1314F4DDE6003E7A70 /* Geolocation.cpp */,
9746AF1414F4DDE6003E7A70 /* Geolocation.h */,
9746AF1514F4DDE6003E7A70 /* Geolocation.idl */,
@@ -23600,7 +23600,7 @@
E1424C94164B52C800F32D40 /* CookieJar.h in Headers */,
339B5B63131DAA3200F48D02 /* CookiesStrategy.h in Headers */,
33D0212D131DB37B004091A8 /* CookieStorage.h in Headers */,
- FE6FD4880F676E5700092873 /* Coordinates.h in Headers */,
+ 9746AF2114F4DDE6003E7A71 /* Coordinates.h in Headers */,
A80E6D040A1989CA007FB8C5 /* Counter.h in Headers */,
BC5EB9790E82069200B25965 /* CounterContent.h in Headers */,
BC5EB9510E82056B00B25965 /* CounterDirectives.h in Headers */,
Deleted: trunk/Source/WebCore/page/Coordinates.h (146569 => 146570)
--- trunk/Source/WebCore/page/Coordinates.h 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/page/Coordinates.h 2013-03-22 07:52:09 UTC (rev 146570)
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef Coordinates_h
-#define Coordinates_h
-
-#include "Event.h"
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class Coordinates : public RefCounted<Coordinates> {
-public:
- static PassRefPtr<Coordinates> create(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed) { return adoptRef(new Coordinates(latitude, longitude, providesAltitude, altitude, accuracy, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed)); }
-
- PassRefPtr<Coordinates> isolatedCopy() const
- {
- return Coordinates::create(m_latitude, m_longitude, m_canProvideAltitude, m_altitude, m_accuracy, m_canProvideAltitudeAccuracy, m_altitudeAccuracy, m_canProvideHeading, m_heading, m_canProvideSpeed, m_speed);
- }
-
- double latitude() const { return m_latitude; }
- double longitude() const { return m_longitude; }
- double altitude() const { return m_altitude; }
- double accuracy() const { return m_accuracy; }
- double altitudeAccuracy() const { return m_altitudeAccuracy; }
- double heading() const { return m_heading; }
- double speed() const { return m_speed; }
-
- bool canProvideAltitude() const { return m_canProvideAltitude; }
- bool canProvideAltitudeAccuracy() const { return m_canProvideAltitudeAccuracy; }
- bool canProvideHeading() const { return m_canProvideHeading; }
- bool canProvideSpeed() const { return m_canProvideSpeed; }
-
-private:
- Coordinates(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed)
- : m_latitude(latitude)
- , m_longitude(longitude)
- , m_altitude(altitude)
- , m_accuracy(accuracy)
- , m_altitudeAccuracy(altitudeAccuracy)
- , m_heading(heading)
- , m_speed(speed)
- , m_canProvideAltitude(providesAltitude)
- , m_canProvideAltitudeAccuracy(providesAltitudeAccuracy)
- , m_canProvideHeading(providesHeading)
- , m_canProvideSpeed(providesSpeed)
- {
- }
-
- double m_latitude;
- double m_longitude;
- double m_altitude;
- double m_accuracy;
- double m_altitudeAccuracy;
- double m_heading;
- double m_speed;
-
- bool m_canProvideAltitude;
- bool m_canProvideAltitudeAccuracy;
- bool m_canProvideHeading;
- bool m_canProvideSpeed;
-};
-
-} // namespace WebCore
-
-#endif // Coordinates_h
Deleted: trunk/Source/WebCore/page/Coordinates.idl (146569 => 146570)
--- trunk/Source/WebCore/page/Coordinates.idl 2013-03-22 07:41:27 UTC (rev 146569)
+++ trunk/Source/WebCore/page/Coordinates.idl 2013-03-22 07:52:09 UTC (rev 146570)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-[
- OmitConstructor,
- ImplementationLacksVTable
-] interface Coordinates {
- readonly attribute double latitude;
- readonly attribute double longitude;
- [Custom] readonly attribute double altitude;
- readonly attribute double accuracy;
- [Custom] readonly attribute double altitudeAccuracy;
- [Custom] readonly attribute double heading;
- [Custom] readonly attribute double speed;
-};
