Diff
Modified: trunk/Source/WebCore/ChangeLog (146574 => 146575)
--- trunk/Source/WebCore/ChangeLog 2013-03-22 08:29:59 UTC (rev 146574)
+++ trunk/Source/WebCore/ChangeLog 2013-03-22 08:38:27 UTC (rev 146575)
@@ -1,3 +1,22 @@
+2013-03-22 Steve Block <[email protected]>
+
+ Move GeolocationClient.h to Modules/geolocation/
+ https://bugs.webkit.org/show_bug.cgi?id=112997
+
+ Reviewed by Kentaro Hara.
+
+ No new tests, no functional change.
+
+ * GNUmakefile.list.am:
+ * Modules/geolocation/GeolocationClient.h: Renamed from Source/WebCore/page/GeolocationClient.h.
+ (WebCore):
+ (GeolocationClient):
+ (WebCore::GeolocationClient::~GeolocationClient):
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+
2013-03-22 Sheriff Bot <[email protected]>
Unreviewed, rolling out r146534 and r146565.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (146574 => 146575)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-03-22 08:29:59 UTC (rev 146574)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-03-22 08:38:27 UTC (rev 146575)
@@ -1859,6 +1859,7 @@
Source/WebCore/Modules/geolocation/Coordinates.h \
Source/WebCore/Modules/geolocation/Geolocation.cpp \
Source/WebCore/Modules/geolocation/Geolocation.h \
+ Source/WebCore/Modules/geolocation/GeolocationClient.h \
Source/WebCore/Modules/geolocation/GeolocationController.cpp \
Source/WebCore/Modules/geolocation/GeolocationController.h \
Source/WebCore/Modules/geolocation/GeolocationError.h \
@@ -4210,7 +4211,6 @@
Source/WebCore/page/FrameTree.h \
Source/WebCore/page/FrameView.cpp \
Source/WebCore/page/FrameView.h \
- Source/WebCore/page/GeolocationClient.h \
Source/WebCore/page/GestureTapHighlighter.cpp \
Source/WebCore/page/GestureTapHighlighter.h \
Source/WebCore/page/GroupSettings.cpp \
Copied: trunk/Source/WebCore/Modules/geolocation/GeolocationClient.h (from rev 146574, trunk/Source/WebCore/page/GeolocationClient.h) (0 => 146575)
--- trunk/Source/WebCore/Modules/geolocation/GeolocationClient.h (rev 0)
+++ trunk/Source/WebCore/Modules/geolocation/GeolocationClient.h 2013-03-22 08:38:27 UTC (rev 146575)
@@ -0,0 +1,61 @@
+/*
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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 GeolocationClient_h
+#define GeolocationClient_h
+
+namespace WebCore {
+
+class Geolocation;
+class GeolocationPosition;
+class Page;
+
+class GeolocationClient {
+public:
+ virtual void geolocationDestroyed() = 0;
+
+ virtual void startUpdating() = 0;
+ virtual void stopUpdating() = 0;
+ // FIXME: The V2 Geolocation specification proposes that this property is
+ // renamed. See http://www.w3.org/2008/geolocation/track/issues/6
+ // We should update WebKit to reflect this if and when the V2 specification
+ // is published.
+ virtual void setEnableHighAccuracy(bool) = 0;
+ virtual GeolocationPosition* lastPosition() = 0;
+
+ virtual void requestPermission(Geolocation*) = 0;
+ virtual void cancelPermissionRequest(Geolocation*) = 0;
+
+ void provideGeolocationTo(Page*, GeolocationClient*);
+
+protected:
+ virtual ~GeolocationClient() { }
+};
+
+void provideGeolocationTo(Page*, GeolocationClient*);
+
+} // namespace WebCore
+
+#endif // GeolocationClient_h
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (146574 => 146575)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-03-22 08:29:59 UTC (rev 146574)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-03-22 08:38:27 UTC (rev 146575)
@@ -25190,6 +25190,10 @@
>
</File>
<File
+ RelativePath="..\Modules\geolocation\GeolocationClient.h"
+ >
+ </File>
+ <File
RelativePath="..\Modules\geolocation\GeolocationController.cpp"
>
</File>
@@ -27563,10 +27567,6 @@
>
</File>
<File
- RelativePath="..\page\GeolocationClient.h"
- >
- </File>
- <File
RelativePath="..\page\GroupSettings.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (146574 => 146575)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-22 08:29:59 UTC (rev 146574)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-03-22 08:38:27 UTC (rev 146575)
@@ -11235,6 +11235,7 @@
<ClInclude Include="..\Modules\filesystem\WorkerContextFileSystem.h" />
<ClInclude Include="..\Modules\geolocation\Coordinates.h" />
<ClInclude Include="..\Modules\geolocation\Geolocation.h" />
+ <ClInclude Include="..\Modules\geolocation\GeolocationClient.h" />
<ClInclude Include="..\Modules\geolocation\GeolocationController.h" />
<ClInclude Include="..\Modules\geolocation\GeolocationError.h" />
<ClInclude Include="..\Modules\geolocation\GeolocationPosition.h" />
@@ -11421,7 +11422,6 @@
<ClInclude Include="..\page\FrameDestructionObserver.h" />
<ClInclude Include="..\page\FrameTree.h" />
<ClInclude Include="..\page\FrameView.h" />
- <ClInclude Include="..\page\GeolocationClient.h" />
<ClInclude Include="..\page\GroupSettings.h" />
<ClInclude Include="..\page\History.h" />
<ClInclude Include="..\page\animation\ImplicitAnimation.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (146574 => 146575)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-22 08:29:59 UTC (rev 146574)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-03-22 08:38:27 UTC (rev 146575)
@@ -8373,6 +8373,9 @@
<ClInclude Include="..\Modules\geolocation\Geolocation.h">
<Filter>Modules\geolocation</Filter>
</ClInclude>
+ <ClInclude Include="..\Modules\geolocation\GeolocationClient.h">
+ <Filter>page</Filter>
+ </ClInclude>
<ClInclude Include="..\Modules\geolocation\GeolocationController.h">
<Filter>Modules\geolocation</Filter>
</ClInclude>
@@ -8913,9 +8916,6 @@
<ClInclude Include="..\page\FrameView.h">
<Filter>page</Filter>
</ClInclude>
- <ClInclude Include="..\page\GeolocationClient.h">
- <Filter>page</Filter>
- </ClInclude>
<ClInclude Include="..\page\GroupSettings.h">
<Filter>page</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (146574 => 146575)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-03-22 08:29:59 UTC (rev 146574)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-03-22 08:38:27 UTC (rev 146575)
@@ -3581,6 +3581,7 @@
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, ); }; };
+ 9746AF2514F4DDE6003E7A71 /* GeolocationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 9746AF1514F4DDE6003E7A71 /* GeolocationClient.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, ); }; };
@@ -5567,7 +5568,6 @@
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 */; };
- BC56CB2310D5AC8000A77C64 /* GeolocationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1E10D5AC8000A77C64 /* GeolocationClient.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 */; };
@@ -11097,6 +11097,7 @@
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>"; };
+ 9746AF1514F4DDE6003E7A71 /* GeolocationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationClient.h; path = Modules/geolocation/GeolocationClient.h; sourceTree = "<group>"; };
9746AF1614F4DDE6003E7A70 /* GeolocationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeolocationController.cpp; path = Modules/geolocation/GeolocationController.cpp; sourceTree = "<group>"; };
9746AF1714F4DDE6003E7A70 /* GeolocationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationController.h; path = Modules/geolocation/GeolocationController.h; sourceTree = "<group>"; };
9746AF1814F4DDE6003E7A70 /* GeolocationError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeolocationError.h; path = Modules/geolocation/GeolocationError.h; sourceTree = "<group>"; };
@@ -13197,7 +13198,6 @@
BC53DA5F1143141A000D817E /* DOMObjectHashTableMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMObjectHashTableMap.h; sourceTree = "<group>"; };
BC53DA61114314BD000D817E /* DOMObjectHashTableMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMObjectHashTableMap.cpp; sourceTree = "<group>"; };
BC53DAC611433064000D817E /* JSDOMWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWrapper.cpp; sourceTree = "<group>"; };
- BC56CB1E10D5AC8000A77C64 /* GeolocationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationClient.h; sourceTree = "<group>"; };
BC5823F40C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLElementCustom.cpp; sourceTree = "<group>"; };
BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSStyleDeclarationCustom.cpp; sourceTree = "<group>"; };
BC588AEF0BFA6CF900EE679E /* HTMLParserErrorCodes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLParserErrorCodes.h; sourceTree = "<group>"; };
@@ -16527,7 +16527,6 @@
65A21483097A3F5300B9050A /* FrameTree.h */,
65CBFEF70974F607001DAC25 /* FrameView.cpp */,
65CBFEF80974F607001DAC25 /* FrameView.h */,
- BC56CB1E10D5AC8000A77C64 /* GeolocationClient.h */,
C50B561412119D23008B46E0 /* GroupSettings.cpp */,
C50B561512119D23008B46E0 /* GroupSettings.h */,
BC94D1500C275C8B006BC617 /* History.cpp */,
@@ -18514,6 +18513,7 @@
9746AF1314F4DDE6003E7A70 /* Geolocation.cpp */,
9746AF1414F4DDE6003E7A70 /* Geolocation.h */,
9746AF1514F4DDE6003E7A70 /* Geolocation.idl */,
+ 9746AF1514F4DDE6003E7A71 /* GeolocationClient.h */,
9746AF1614F4DDE6003E7A70 /* GeolocationController.cpp */,
9746AF1714F4DDE6003E7A70 /* GeolocationController.h */,
9746AF1814F4DDE6003E7A70 /* GeolocationError.h */,
@@ -24634,7 +24634,7 @@
A622A8FF122C44A600A785B3 /* GenericBinding.h in Headers */,
0720B0A114D3323500642955 /* GenericEventQueue.h in Headers */,
9746AF2414F4DDE6003E7A70 /* Geolocation.h in Headers */,
- BC56CB2310D5AC8000A77C64 /* GeolocationClient.h in Headers */,
+ 9746AF2514F4DDE6003E7A71 /* GeolocationClient.h in Headers */,
9746AF2714F4DDE6003E7A70 /* GeolocationController.h in Headers */,
9746AF2814F4DDE6003E7A70 /* GeolocationError.h in Headers */,
9746AF2914F4DDE6003E7A70 /* GeolocationPosition.h in Headers */,
Deleted: trunk/Source/WebCore/page/GeolocationClient.h (146574 => 146575)
--- trunk/Source/WebCore/page/GeolocationClient.h 2013-03-22 08:29:59 UTC (rev 146574)
+++ trunk/Source/WebCore/page/GeolocationClient.h 2013-03-22 08:38:27 UTC (rev 146575)
@@ -1,61 +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. AND ITS CONTRIBUTORS ``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 ITS 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 GeolocationClient_h
-#define GeolocationClient_h
-
-namespace WebCore {
-
-class Geolocation;
-class GeolocationPosition;
-class Page;
-
-class GeolocationClient {
-public:
- virtual void geolocationDestroyed() = 0;
-
- virtual void startUpdating() = 0;
- virtual void stopUpdating() = 0;
- // FIXME: The V2 Geolocation specification proposes that this property is
- // renamed. See http://www.w3.org/2008/geolocation/track/issues/6
- // We should update WebKit to reflect this if and when the V2 specification
- // is published.
- virtual void setEnableHighAccuracy(bool) = 0;
- virtual GeolocationPosition* lastPosition() = 0;
-
- virtual void requestPermission(Geolocation*) = 0;
- virtual void cancelPermissionRequest(Geolocation*) = 0;
-
- void provideGeolocationTo(Page*, GeolocationClient*);
-
-protected:
- virtual ~GeolocationClient() { }
-};
-
-void provideGeolocationTo(Page*, GeolocationClient*);
-
-} // namespace WebCore
-
-#endif // GeolocationClient_h
