Removes Geolocation Geoposition.toString and Coordinates.toString.

This fixes http://b/issue?id=2103855.

Change-Id: I1811d97c59e0458a94347c8a63b4d1c0541dfaf7

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 8c6a926..37a77d4 100644 (file)
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -556,7 +556,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        page/Chrome.cpp \
        page/Console.cpp \
        page/ContextMenuController.cpp \
-       page/Coordinates.cpp \
        page/DOMSelection.cpp \
        page/DOMTimer.cpp \
        page/DOMWindow.cpp \
@@ -567,7 +566,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        page/FrameTree.cpp \
        page/FrameView.cpp \
        page/Geolocation.cpp \
-       page/Geoposition.cpp \
        page/History.cpp \
        page/Location.cpp \
        page/MouseEventWithHitTestResults.cpp \

diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk
index d604564..6f3d987 100644 (file)
--- a/WebCore/Android.v8.mk
+++ b/WebCore/Android.v8.mk
@@ -382,7 +382,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        page/Chrome.cpp \
        page/Console.cpp \
        page/ContextMenuController.cpp \
-       page/Coordinates.cpp \
        page/DOMSelection.cpp \
        page/DOMTimer.cpp \
        page/DOMWindow.cpp \
@@ -393,7 +392,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        page/FrameTree.cpp \
        page/FrameView.cpp \
        page/Geolocation.cpp \
-       page/Geoposition.cpp \
        page/History.cpp \
        page/Location.cpp \
        page/MouseEventWithHitTestResults.cpp \

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index c70f8d4..50e6a2a 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -4524,7 +4524,6 @@
                F916C48D0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F916C48B0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp */; };
                F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */; };
                F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */; };
-               FE6FD4870F676E5700092873 /* Coordinates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE6FD4840F676E5700092873 /* Coordinates.cpp */; };
                FE6FD4880F676E5700092873 /* Coordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD4850F676E5700092873 /* Coordinates.h */; };
                FE6FD48D0F676E9300092873 /* JSCoordinates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE6FD48B0F676E9300092873 /* JSCoordinates.cpp */; };
                FE6FD48E0F676E9300092873 /* JSCoordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD48C0F676E9300092873 /* JSCoordinates.h */; };
@@ -4536,7 +4535,6 @@
                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, ); }; };
-               FE80D7C80E9C1F25000D6F75 /* Geoposition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */; };
                FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */; };
                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, ); }; };
@@ -9480,7 +9478,6 @@
                F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequestProgressEvent.h; sourceTree = "<group>"; };
                F9F0ED780DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = XMLHttpRequestProgressEvent.idl; sourceTree = "<group>"; };
                FE49EF970DC51462004266E1 /* DashboardSupportCSSPropertyNames.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DashboardSupportCSSPropertyNames.in; sourceTree = "<group>"; };
-               FE6FD4840F676E5700092873 /* Coordinates.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Coordinates.cpp; 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>"; };
@@ -9494,7 +9491,6 @@
                FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geolocation.cpp; sourceTree = "<group>"; };
                FE80D7B80E9C1F25000D6F75 /* Geolocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geolocation.h; sourceTree = "<group>"; };
                FE80D7B90E9C1F25000D6F75 /* Geolocation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Geolocation.idl; sourceTree = "<group>"; };
-               FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Geoposition.cpp; sourceTree = "<group>"; };
                FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Geoposition.h; sourceTree = "<group>"; };
                FE80D7BC0E9C1F25000D6F75 /* Geoposition.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Geoposition.idl; sourceTree = "<group>"; };
                FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PositionCallback.h; sourceTree = "<group>"; };
@@ -10548,7 +10544,6 @@
                                065AD4F20B0C2EDA005A2B1D /* ContextMenuClient.h */,
                                065AD4F30B0C2EDA005A2B1D /* ContextMenuController.cpp */,
                                065AD4F40B0C2EDA005A2B1D /* ContextMenuController.h */,
-                               FE6FD4840F676E5700092873 /* Coordinates.cpp */,
                                FE6FD4850F676E5700092873 /* Coordinates.h */,
                                FE6FD4860F676E5700092873 /* Coordinates.idl */,
                                BC5A86810C33676000EEA649 /* DOMSelection.cpp */,
@@ -10579,7 +10574,6 @@
                                FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */,
                                FE80D7B80E9C1F25000D6F75 /* Geolocation.h */,
                                FE80D7B90E9C1F25000D6F75 /* Geolocation.idl */,
-                               FE80D7BA0E9C1F25000D6F75 /* Geoposition.cpp */,
                                FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */,
                                FE80D7BC0E9C1F25000D6F75 /* Geoposition.idl */,
                                BC94D1500C275C8B006BC617 /* History.cpp */,
@@ -17562,7 +17556,6 @@
                                06027CB30B1CC03D00884B2D /* ContextMenuItemMac.mm in Sources */,
                                93B6A0EA0B0BCA8400F5027A /* ContextMenuMac.mm in Sources */,
                                9352087709BD453400F2038D /* CookieJar.mm in Sources */,
-                               FE6FD4870F676E5700092873 /* Coordinates.cpp in Sources */,
                                3724CA580E68A7E400DB4384 /* CoreTextController.cpp in Sources */,
                                BC5EB9500E82056B00B25965 /* CounterDirectives.cpp in Sources */,
                                9392F1500AD1862300691BD4 /* CounterNode.cpp in Sources */,
@@ -17998,7 +17991,6 @@
                                FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */,
                                FEAB90120EA51B9C006348C3 /* GeolocationService.cpp in Sources */,
                                BCE494AC0F4F5E9E0084E319 /* GeolocationServiceMac.mm in Sources */,
-                               FE80D7C80E9C1F25000D6F75 /* Geoposition.cpp in Sources */,
                                B2C3DA6D0D006CD600EF6F26 /* GlyphPageTreeNode.cpp in Sources */,
                                B2AFFC830D00A5C10030074D /* GlyphPageTreeNodeMac.cpp in Sources */,
                                B2C3DA6F0D006CD600EF6F26 /* GlyphWidthMap.cpp in Sources */,

diff --git a/WebCore/page/Coordinates.cpp b/WebCore/page/Coordinates.cpp
deleted file mode 100644 (file)
index 220c04d..0000000
--- a/WebCore/page/Coordinates.cpp
+++ /dev/null
@@ -1,42 +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. 
- */
-
-#include "config.h"
-#include "Coordinates.h"
-
-namespace WebCore {
-
-String Coordinates::toString() const
-{
-    return String::format("coordinates(latitude: %.6lg, longitude: %.6lg", m_latitude, m_longitude)
-        + (m_canProvideAltitude ? String::format(", altitude: %.6lg", m_altitude) : "")
-        + String::format(", accuracy: %.6lg", m_accuracy)
-        + (m_canProvideAltitudeAccuracy ? String::format(", altitudeAccuracy: %.6lg", m_altitudeAccuracy) : "")
-        + (m_canProvideHeading ? String::format(", heading: %.6lg", m_heading) : "")
-        + (m_canProvideSpeed ? String::format(", speed: %.6lg", m_speed) : "")
-        + ")";
-}
-
-} // namespace WebCore

diff --git a/WebCore/page/Coordinates.h b/WebCore/page/Coordinates.h
index acb5dd0..43870a1 100644 (file)
--- a/WebCore/page/Coordinates.h
+++ b/WebCore/page/Coordinates.h
@@ -50,8 +50,6 @@ public:
     bool canProvideAltitudeAccuracy() const { return m_canProvideAltitudeAccuracy; }
     bool canProvideHeading() const { return m_canProvideHeading; }
     bool canProvideSpeed() const { return m_canProvideSpeed; }
-    
-    String toString() const;
 
 private:
     Coordinates(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed)

diff --git a/WebCore/page/Coordinates.idl b/WebCore/page/Coordinates.idl
index f6c82b5..f847325 100644 (file)
--- a/WebCore/page/Coordinates.idl
+++ b/WebCore/page/Coordinates.idl
@@ -33,9 +33,5 @@ module core {
         readonly attribute [Custom] double altitudeAccuracy;
         readonly attribute [Custom] double heading;
         readonly attribute [Custom] double speed;
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-        [DontEnum] DOMString toString();
-#endif
     };
 }

diff --git a/WebCore/page/Geoposition.cpp b/WebCore/page/Geoposition.cpp
deleted file mode 100644 (file)
index 8f7a5c8..0000000
--- a/WebCore/page/Geoposition.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2008 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. 
- */
-
-#include "config.h"
-#include "Geoposition.h"
-
-namespace WebCore {
-
-String Geoposition::toString() const
-{
-    return "position(" + m_coordinates->toString() + String::format(", %.lld)", m_timestamp);
-}
-
-} // namespace WebCore

diff --git a/WebCore/page/Geoposition.h b/WebCore/page/Geoposition.h
index 505e8b3..f3c703b 100644 (file)
--- a/WebCore/page/Geoposition.h
+++ b/WebCore/page/Geoposition.h
@@ -42,8 +42,6 @@ public:
     DOMTimeStamp timestamp() const { return m_timestamp; }
     Coordinates* coords() const { return m_coordinates.get(); }
     
-    String toString() const;
-
 private:
     Geoposition(PassRefPtr<Coordinates> coordinates, DOMTimeStamp timestamp)
         : m_coordinates(coordinates)

diff --git a/WebCore/page/Geoposition.idl b/WebCore/page/Geoposition.idl
index de508fe..3ec8b0b 100644 (file)
--- a/WebCore/page/Geoposition.idl
+++ b/WebCore/page/Geoposition.idl
@@ -28,9 +28,5 @@ module core {
     interface Geoposition {
         readonly attribute Coordinates coords;
         readonly attribute DOMTimeStamp timestamp;
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-        [DontEnum] DOMString toString();
-#endif
     };
 }