[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 15:47:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bddc1b7d9aaa6349bc2db0a902d9d7dbc8c03d59
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 12 12:04:32 2010 +0000
2010-11-12 John Knottenbelt <jknotten at chromium.org>
Reviewed by Steve Block.
Rename GeolocationControllerClient to GeolocationClient.
https://bugs.webkit.org/show_bug.cgi?id=49259
No new tests, renaming only.
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.order:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* page/GeolocationClient.h: Renamed from WebCore/page/GeolocationControllerClient.h.
(WebCore::GeolocationClient::~GeolocationClient):
* page/GeolocationController.cpp:
(WebCore::GeolocationController::GeolocationController):
* page/GeolocationController.h:
* page/Page.h:
2010-11-12 John Knottenbelt <jknotten at chromium.org>
Reviewed by Steve Block.
Rename GeolocationControllerClient to GeolocationClient.
https://bugs.webkit.org/show_bug.cgi?id=49259
* WebKit.xcodeproj/project.pbxproj:
2010-11-12 John Knottenbelt <jknotten at chromium.org>
Reviewed by Steve Block.
Rename GeolocationControllerClient to GeolocationClient.
https://bugs.webkit.org/show_bug.cgi?id=49259
* WebCoreSupport/WebGeolocationClient.h: Renamed from WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.h.
(WebGeolocationClient::webView):
(WebGeolocationClient::setEnableHighAccuracy):
* WebCoreSupport/WebGeolocationClient.mm: Renamed from WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.mm.
(WebGeolocationClient::WebGeolocationClient):
(WebGeolocationClient::geolocationDestroyed):
(WebGeolocationClient::startUpdating):
(WebGeolocationClient::stopUpdating):
(WebGeolocationClient::lastPosition):
* WebKit.order:
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
2010-11-12 John Knottenbelt <jknotten at chromium.org>
Reviewed by Steve Block.
Rename GeolocationControllerClient to GeolocationClient.
https://bugs.webkit.org/show_bug.cgi?id=49259
* WebCoreSupport/WebGeolocationClient.cpp: Renamed from WebKit/win/WebCoreSupport/WebGeolocationControllerClient.cpp.
(WebGeolocationClient::WebGeolocationClient):
(WebGeolocationClient::geolocationDestroyed):
(WebGeolocationClient::startUpdating):
(WebGeolocationClient::stopUpdating):
(WebGeolocationClient::lastPosition):
* WebCoreSupport/WebGeolocationClient.h: Renamed from WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h.
(WebGeolocationClient::setEnableHighAccuracy):
* WebKit.vcproj/WebKit.vcproj:
* WebView.cpp:
(WebView::initWithFrame):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71903 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a612a10..6fc07f0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-11-12 John Knottenbelt <jknotten at chromium.org>
+
+ Reviewed by Steve Block.
+
+ Rename GeolocationControllerClient to GeolocationClient.
+ https://bugs.webkit.org/show_bug.cgi?id=49259
+
+ No new tests, renaming only.
+
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.order:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * page/GeolocationClient.h: Renamed from WebCore/page/GeolocationControllerClient.h.
+ (WebCore::GeolocationClient::~GeolocationClient):
+ * page/GeolocationController.cpp:
+ (WebCore::GeolocationController::GeolocationController):
+ * page/GeolocationController.h:
+ * page/Page.h:
+
2010-11-12 Ilya Sherman <isherman at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 1edd953..7ab6259 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2102,15 +2102,15 @@ webcore_sources += \
WebCore/page/FrameTree.h \
WebCore/page/FrameView.cpp \
WebCore/page/FrameView.h \
- WebCore/page/GeolocationControllerClient.h \
- WebCore/page/GeolocationController.cpp \
- WebCore/page/GeolocationController.h \
WebCore/page/Geolocation.cpp \
- WebCore/page/GeolocationError.h \
WebCore/page/Geolocation.h \
+ WebCore/page/GeolocationClient.h \
+ WebCore/page/GeolocationError.h \
+ WebCore/page/GeolocationController.cpp \
+ WebCore/page/GeolocationController.h \
+ WebCore/page/GeolocationPosition.h \
WebCore/page/GeolocationPositionCache.cpp \
WebCore/page/GeolocationPositionCache.h \
- WebCore/page/GeolocationPosition.h \
WebCore/page/Geoposition.h \
WebCore/page/GroupSettings.cpp \
WebCore/page/GroupSettings.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 846b6a1..eeaf9b2 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2238,9 +2238,9 @@
'page/FrameView.h',
'page/Geolocation.cpp',
'page/Geolocation.h',
+ 'page/GeolocationClient.h',
'page/GeolocationController.cpp',
'page/GeolocationController.h',
- 'page/GeolocationControllerClient.h',
'page/GeolocationError.h',
'page/GeolocationPosition.h',
'page/GeolocationPositionCache.cpp',
diff --git a/WebCore/WebCore.order b/WebCore/WebCore.order
index 0c852e1..76f3275 100644
--- a/WebCore/WebCore.order
+++ b/WebCore/WebCore.order
@@ -168,8 +168,8 @@ __ZN7WebCore16InspectorBackendC1EPNS_19InspectorControllerE
__ZN7WebCore16InspectorBackendC2EPNS_19InspectorControllerE
__ZN7WebCore18InjectedScriptHostC1EPNS_19InspectorControllerE
__ZN7WebCore18InjectedScriptHostC2EPNS_19InspectorControllerE
-__ZN7WebCore21GeolocationControllerC1EPNS_4PageEPNS_27GeolocationControllerClientE
-__ZN7WebCore21GeolocationControllerC2EPNS_4PageEPNS_27GeolocationControllerClientE
+__ZN7WebCore21GeolocationControllerC1EPNS_4PageEPNS_27GeolocationClientE
+__ZN7WebCore21GeolocationControllerC2EPNS_4PageEPNS_27GeolocationClientE
__ZN7WebCore8SettingsC1EPNS_4PageE
__ZN7WebCore8SettingsC2EPNS_4PageE
__ZN7WebCore15ProgressTrackerC1Ev
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 2280dc5..1f18b40 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -23396,18 +23396,18 @@
>
</File>
<File
- RelativePath="..\page\GeolocationController.cpp"
+ RelativePath="..\page\GeolocationClient.h"
>
</File>
<File
- RelativePath="..\page\GeolocationController.h"
+ RelativePath="..\page\GeolocationController.cpp"
>
</File>
<File
- RelativePath="..\page\GeolocationControllerClient.h"
+ RelativePath="..\page\GeolocationController.h"
>
</File>
- <File
+ <File
RelativePath="..\page\GeolocationError.h"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index f2b5131..775b333 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -4826,9 +4826,9 @@
BC53DAC211432EEE000D817E /* JSDebugWrapperSet.h in Headers */ = {isa = PBXBuildFile; fileRef = BC53DAC111432EEE000D817E /* JSDebugWrapperSet.h */; };
BC53DAC511432FD9000D817E /* JSDebugWrapperSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC53DAC411432FD9000D817E /* JSDebugWrapperSet.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, ); }; };
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 /* GeolocationControllerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC56CB1E10D5AC8000A77C64 /* GeolocationControllerClient.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 */; };
@@ -10853,9 +10853,9 @@
BC53DAC111432EEE000D817E /* JSDebugWrapperSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDebugWrapperSet.h; sourceTree = "<group>"; };
BC53DAC411432FD9000D817E /* JSDebugWrapperSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDebugWrapperSet.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>"; };
BC56CB1C10D5AC8000A77C64 /* GeolocationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationController.cpp; sourceTree = "<group>"; };
BC56CB1D10D5AC8000A77C64 /* GeolocationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationController.h; sourceTree = "<group>"; };
- BC56CB1E10D5AC8000A77C64 /* GeolocationControllerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationControllerClient.h; sourceTree = "<group>"; };
BC56CB1F10D5AC8000A77C64 /* GeolocationError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationError.h; sourceTree = "<group>"; };
BC56CB2010D5AC8000A77C64 /* GeolocationPosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationPosition.h; sourceTree = "<group>"; };
BC5823F40C0A98DF0053F1B5 /* JSHTMLElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLElementCustom.cpp; sourceTree = "<group>"; };
@@ -13275,9 +13275,9 @@
FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */,
FE80D7B80E9C1F25000D6F75 /* Geolocation.h */,
FE80D7B90E9C1F25000D6F75 /* Geolocation.idl */,
+ BC56CB1E10D5AC8000A77C64 /* GeolocationClient.h */,
BC56CB1C10D5AC8000A77C64 /* GeolocationController.cpp */,
BC56CB1D10D5AC8000A77C64 /* GeolocationController.h */,
- BC56CB1E10D5AC8000A77C64 /* GeolocationControllerClient.h */,
BC56CB1F10D5AC8000A77C64 /* GeolocationError.h */,
BC56CB2010D5AC8000A77C64 /* GeolocationPosition.h */,
596229771133EFD700DC4CBB /* GeolocationPositionCache.cpp */,
@@ -19704,8 +19704,8 @@
BCE04C8A0DAFF7A0007A0F41 /* Generator.h in Headers */,
A622A8FF122C44A600A785B3 /* GenericBinding.h in Headers */,
FE80D7C60E9C1F25000D6F75 /* Geolocation.h in Headers */,
+ BC56CB2310D5AC8000A77C64 /* GeolocationClient.h in Headers */,
BC56CB2210D5AC8000A77C64 /* GeolocationController.h in Headers */,
- BC56CB2310D5AC8000A77C64 /* GeolocationControllerClient.h in Headers */,
BC56CB2410D5AC8000A77C64 /* GeolocationError.h in Headers */,
BC56CB2510D5AC8000A77C64 /* GeolocationPosition.h in Headers */,
5962297A1133EFE200DC4CBB /* GeolocationPositionCache.h in Headers */,
diff --git a/WebCore/page/GeolocationClient.h b/WebCore/page/GeolocationClient.h
new file mode 100644
index 0000000..c646f91
--- /dev/null
+++ b/WebCore/page/GeolocationClient.h
@@ -0,0 +1,52 @@
+/*
+ * 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 GeolocationPosition;
+
+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;
+
+protected:
+ virtual ~GeolocationClient() { }
+};
+
+} // namespace WebCore
+
+#endif // GeolocationClient_h
diff --git a/WebCore/page/GeolocationController.cpp b/WebCore/page/GeolocationController.cpp
index 08932a9..db4cc23 100644
--- a/WebCore/page/GeolocationController.cpp
+++ b/WebCore/page/GeolocationController.cpp
@@ -29,11 +29,11 @@
#if ENABLE(CLIENT_BASED_GEOLOCATION)
-#include "GeolocationControllerClient.h"
+#include "GeolocationClient.h"
namespace WebCore {
-GeolocationController::GeolocationController(Page* page, GeolocationControllerClient* client)
+GeolocationController::GeolocationController(Page* page, GeolocationClient* client)
: m_page(page)
, m_client(client)
{
diff --git a/WebCore/page/GeolocationController.h b/WebCore/page/GeolocationController.h
index 57f6e32..2d8106d 100644
--- a/WebCore/page/GeolocationController.h
+++ b/WebCore/page/GeolocationController.h
@@ -35,14 +35,14 @@
namespace WebCore {
-class GeolocationControllerClient;
+class GeolocationClient;
class GeolocationError;
class GeolocationPosition;
class Page;
class GeolocationController : public Noncopyable {
public:
- GeolocationController(Page*, GeolocationControllerClient*);
+ GeolocationController(Page*, GeolocationClient*);
~GeolocationController();
void addObserver(Geolocation*, bool enableHighAccuracy);
@@ -55,7 +55,7 @@ public:
private:
Page* m_page;
- GeolocationControllerClient* m_client;
+ GeolocationClient* m_client;
RefPtr<GeolocationPosition> m_lastPosition;
typedef HashSet<RefPtr<Geolocation> > ObserversSet;
diff --git a/WebCore/page/GeolocationControllerClient.h b/WebCore/page/GeolocationControllerClient.h
deleted file mode 100644
index 4648cf8..0000000
--- a/WebCore/page/GeolocationControllerClient.h
+++ /dev/null
@@ -1,52 +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 GeolocationControllerClient_h
-#define GeolocationControllerClient_h
-
-namespace WebCore {
-
-class GeolocationPosition;
-
-class GeolocationControllerClient {
-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;
-
-protected:
- virtual ~GeolocationControllerClient() { }
-};
-
-} // namespace WebCore
-
-#endif // GeolocationControllerClient_h
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 746e53e..be3df9a 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -143,7 +143,7 @@ Page::Page(const PageClients& pageClients)
, m_inspectorController(adoptPtr(new InspectorController(this, pageClients.inspectorClient)))
#endif
#if ENABLE(CLIENT_BASED_GEOLOCATION)
- , m_geolocationController(adoptPtr(new GeolocationController(this, pageClients.geolocationControllerClient)))
+ , m_geolocationController(adoptPtr(new GeolocationController(this, pageClients.geolocationClient)))
#endif
#if ENABLE(DEVICE_ORIENTATION)
, m_deviceMotionController(RuntimeEnabledFeatures::deviceMotionEnabled() ? new DeviceMotionController(pageClients.deviceMotionClient) : 0)
@@ -919,7 +919,7 @@ Page::PageClients::PageClients()
, dragClient(0)
, inspectorClient(0)
, pluginHalterClient(0)
- , geolocationControllerClient(0)
+ , geolocationClient(0)
, deviceMotionClient(0)
, deviceOrientationClient(0)
, speechInputClient(0)
diff --git a/WebCore/page/Page.h b/WebCore/page/Page.h
index 89ad7b8..e074814 100644
--- a/WebCore/page/Page.h
+++ b/WebCore/page/Page.h
@@ -54,8 +54,8 @@ namespace WebCore {
class EditorClient;
class FocusController;
class Frame;
+ class GeolocationClient;
class GeolocationController;
- class GeolocationControllerClient;
class HaltablePlugin;
class HistoryItem;
class InspectorClient;
@@ -104,7 +104,7 @@ namespace WebCore {
DragClient* dragClient;
InspectorClient* inspectorClient;
PluginHalterClient* pluginHalterClient;
- GeolocationControllerClient* geolocationControllerClient;
+ GeolocationClient* geolocationClient;
DeviceMotionClient* deviceMotionClient;
DeviceOrientationClient* deviceOrientationClient;
RefPtr<BackForwardList> backForwardClient;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ff4ab64..16b53e9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-12 John Knottenbelt <jknotten at chromium.org>
+
+ Reviewed by Steve Block.
+
+ Rename GeolocationControllerClient to GeolocationClient.
+ https://bugs.webkit.org/show_bug.cgi?id=49259
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2010-11-08 Leandro Pereira <leandro at profusion.mobi>
[EFL] Unreviewed. Build fix after r71496.
diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index be3caeb..6878bb2 100644
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -348,8 +348,8 @@
BC2E464E0FD8A96800A9D9DE /* WebViewData.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC2E464C0FD8A96800A9D9DE /* WebViewData.mm */; };
BC542C420FD7766F00D8AB5D /* WebDelegateImplementationCaching.h in Headers */ = {isa = PBXBuildFile; fileRef = BC542C400FD7766F00D8AB5D /* WebDelegateImplementationCaching.h */; };
BC542C430FD7766F00D8AB5D /* WebDelegateImplementationCaching.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC542C410FD7766F00D8AB5D /* WebDelegateImplementationCaching.mm */; };
- BC7F884B10C8775A00D6133D /* WebGeolocationControllerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F884910C8775A00D6133D /* WebGeolocationControllerClient.h */; };
- BC7F884C10C8775A00D6133D /* WebGeolocationControllerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7F884A10C8775A00D6133D /* WebGeolocationControllerClient.mm */; };
+ BC7F884B10C8775A00D6133D /* WebGeolocationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F884910C8775A00D6133D /* WebGeolocationClient.h */; };
+ BC7F884C10C8775A00D6133D /* WebGeolocationClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7F884A10C8775A00D6133D /* WebGeolocationClient.mm */; };
BC7F889E10C9D30C00D6133D /* WebGeolocationPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F889C10C9D30C00D6133D /* WebGeolocationPosition.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC7F889F10C9D30C00D6133D /* WebGeolocationPosition.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7F889D10C9D30C00D6133D /* WebGeolocationPosition.mm */; };
BC7F88A510C9D88B00D6133D /* WebGeolocationPositionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F88A410C9D88B00D6133D /* WebGeolocationPositionInternal.h */; };
@@ -658,8 +658,8 @@
BC2E464C0FD8A96800A9D9DE /* WebViewData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewData.mm; sourceTree = "<group>"; };
BC542C400FD7766F00D8AB5D /* WebDelegateImplementationCaching.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDelegateImplementationCaching.h; sourceTree = "<group>"; };
BC542C410FD7766F00D8AB5D /* WebDelegateImplementationCaching.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDelegateImplementationCaching.mm; sourceTree = "<group>"; };
- BC7F884910C8775A00D6133D /* WebGeolocationControllerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGeolocationControllerClient.h; sourceTree = "<group>"; };
- BC7F884A10C8775A00D6133D /* WebGeolocationControllerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebGeolocationControllerClient.mm; sourceTree = "<group>"; };
+ BC7F884910C8775A00D6133D /* WebGeolocationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGeolocationClient.h; sourceTree = "<group>"; };
+ BC7F884A10C8775A00D6133D /* WebGeolocationClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebGeolocationClient.mm; sourceTree = "<group>"; };
BC7F889C10C9D30C00D6133D /* WebGeolocationPosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGeolocationPosition.h; sourceTree = "<group>"; };
BC7F889D10C9D30C00D6133D /* WebGeolocationPosition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebGeolocationPosition.mm; sourceTree = "<group>"; };
BC7F88A410C9D88B00D6133D /* WebGeolocationPositionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGeolocationPositionInternal.h; sourceTree = "<group>"; };
@@ -1296,8 +1296,8 @@
931633EE0AEDFFAE0062B92D /* WebFrameLoaderClient.mm */,
9391F273121B38BD00EBF7E8 /* WebFrameNetworkingContext.h */,
9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */,
- BC7F884910C8775A00D6133D /* WebGeolocationControllerClient.h */,
- BC7F884A10C8775A00D6133D /* WebGeolocationControllerClient.mm */,
+ BC7F884910C8775A00D6133D /* WebGeolocationClient.h */,
+ BC7F884A10C8775A00D6133D /* WebGeolocationClient.mm */,
51494CD40C7EBDE0004178C5 /* WebIconDatabaseClient.h */,
51494CD50C7EBDE0004178C5 /* WebIconDatabaseClient.mm */,
9CE1F8A302A5C6F30ECA2ACD /* WebImageRendererFactory.m */,
@@ -1480,7 +1480,7 @@
9398106E0824BF01008DF038 /* WebFrameView.h in Headers */,
9398106F0824BF01008DF038 /* WebFrameViewInternal.h in Headers */,
939810AF0824BF01008DF038 /* WebFrameViewPrivate.h in Headers */,
- BC7F884B10C8775A00D6133D /* WebGeolocationControllerClient.h in Headers */,
+ BC7F884B10C8775A00D6133D /* WebGeolocationClient.h in Headers */,
BC7F889E10C9D30C00D6133D /* WebGeolocationPosition.h in Headers */,
BC7F88A510C9D88B00D6133D /* WebGeolocationPositionInternal.h in Headers */,
939810120824BF01008DF038 /* WebHistory.h in Headers */,
@@ -1892,7 +1892,7 @@
939810F20824BF01008DF038 /* WebFrame.mm in Sources */,
931633EF0AEDFFAE0062B92D /* WebFrameLoaderClient.mm in Sources */,
939811060824BF01008DF038 /* WebFrameView.mm in Sources */,
- BC7F884C10C8775A00D6133D /* WebGeolocationControllerClient.mm in Sources */,
+ BC7F884C10C8775A00D6133D /* WebGeolocationClient.mm in Sources */,
BC7F889F10C9D30C00D6133D /* WebGeolocationPosition.mm in Sources */,
939811130824BF01008DF038 /* WebHistory.mm in Sources */,
939810BD0824BF01008DF038 /* WebHistoryItem.mm in Sources */,
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index cba9747..13b3929 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,23 @@
+2010-11-12 John Knottenbelt <jknotten at chromium.org>
+
+ Reviewed by Steve Block.
+
+ Rename GeolocationControllerClient to GeolocationClient.
+ https://bugs.webkit.org/show_bug.cgi?id=49259
+
+ * WebCoreSupport/WebGeolocationClient.h: Renamed from WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.h.
+ (WebGeolocationClient::webView):
+ (WebGeolocationClient::setEnableHighAccuracy):
+ * WebCoreSupport/WebGeolocationClient.mm: Renamed from WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.mm.
+ (WebGeolocationClient::WebGeolocationClient):
+ (WebGeolocationClient::geolocationDestroyed):
+ (WebGeolocationClient::startUpdating):
+ (WebGeolocationClient::stopUpdating):
+ (WebGeolocationClient::lastPosition):
+ * WebKit.order:
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
+
2010-11-10 Beth Dakin <bdakin at apple.com>
Reviewed by Simon Fraser.
diff --git a/WebKit/mac/WebCoreSupport/WebGeolocationClient.h b/WebKit/mac/WebCoreSupport/WebGeolocationClient.h
new file mode 100644
index 0000000..5ea3369
--- /dev/null
+++ b/WebKit/mac/WebCoreSupport/WebGeolocationClient.h
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+#import <WebCore/GeolocationClient.h>
+
+namespace WebCore {
+ class GeolocationPosition;
+}
+
+ at class WebView;
+
+class WebGeolocationClient : public WebCore::GeolocationClient {
+public:
+ WebGeolocationClient(WebView *);
+ WebView *webView() { return m_webView; }
+
+ void geolocationDestroyed();
+ void startUpdating();
+ void stopUpdating();
+ void setEnableHighAccuracy(bool) { }
+
+ WebCore::GeolocationPosition* lastPosition();
+
+private:
+ WebView *m_webView;
+};
diff --git a/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm b/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm
new file mode 100644
index 0000000..a635b44
--- /dev/null
+++ b/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+#import "WebGeolocationClient.h"
+
+#import "WebGeolocationPositionInternal.h"
+#import "WebViewInternal.h"
+
+using namespace WebCore;
+
+WebGeolocationClient::WebGeolocationClient(WebView *webView)
+ : m_webView(webView)
+{
+}
+
+void WebGeolocationClient::geolocationDestroyed()
+{
+ delete this;
+}
+
+void WebGeolocationClient::startUpdating()
+{
+ [[m_webView _geolocationProvider] registerWebView:m_webView];
+}
+
+void WebGeolocationClient::stopUpdating()
+{
+ [[m_webView _geolocationProvider] unregisterWebView:m_webView];
+}
+
+GeolocationPosition* WebGeolocationClient::lastPosition()
+{
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+ return core([[m_webView _geolocationProvider] lastPosition]);
+#else
+ return 0;
+#endif
+}
diff --git a/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.h b/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.h
deleted file mode 100644
index 34d6a29..0000000
--- a/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.h
+++ /dev/null
@@ -1,48 +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.
- */
-
-#import <WebCore/GeolocationControllerClient.h>
-
-namespace WebCore {
- class GeolocationPosition;
-}
-
- at class WebView;
-
-class WebGeolocationControllerClient : public WebCore::GeolocationControllerClient {
-public:
- WebGeolocationControllerClient(WebView *);
- WebView *webView() { return m_webView; }
-
- void geolocationDestroyed();
- void startUpdating();
- void stopUpdating();
- void setEnableHighAccuracy(bool) { }
-
- WebCore::GeolocationPosition* lastPosition();
-
-private:
- WebView *m_webView;
-};
diff --git a/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.mm b/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.mm
deleted file mode 100644
index 98ffc72..0000000
--- a/WebKit/mac/WebCoreSupport/WebGeolocationControllerClient.mm
+++ /dev/null
@@ -1,60 +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.
- */
-
-#import "WebGeolocationControllerClient.h"
-
-#import "WebGeolocationPositionInternal.h"
-#import "WebViewInternal.h"
-
-using namespace WebCore;
-
-WebGeolocationControllerClient::WebGeolocationControllerClient(WebView *webView)
- : m_webView(webView)
-{
-}
-
-void WebGeolocationControllerClient::geolocationDestroyed()
-{
- delete this;
-}
-
-void WebGeolocationControllerClient::startUpdating()
-{
- [[m_webView _geolocationProvider] registerWebView:m_webView];
-}
-
-void WebGeolocationControllerClient::stopUpdating()
-{
- [[m_webView _geolocationProvider] unregisterWebView:m_webView];
-}
-
-GeolocationPosition* WebGeolocationControllerClient::lastPosition()
-{
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
- return core([[m_webView _geolocationProvider] lastPosition]);
-#else
- return 0;
-#endif
-}
diff --git a/WebKit/mac/WebKit.order b/WebKit/mac/WebKit.order
index c2b5f5d..e566942 100644
--- a/WebKit/mac/WebKit.order
+++ b/WebKit/mac/WebKit.order
@@ -90,8 +90,8 @@ __ZN24WebDatabaseTrackerClient30sharedWebDatabaseTrackerClientEv
__ZN24WebDatabaseTrackerClientC1Ev
__ZN24WebDatabaseTrackerClientC2Ev
__ZL47WebKitInitializeApplicationCachePathIfNecessaryv
-__ZN30WebGeolocationControllerClientC1EP7WebView
-__ZN30WebGeolocationControllerClientC2EP7WebView
+__ZN30WebGeolocationClientC1EP7WebView
+__ZN30WebGeolocationClientC2EP7WebView
__ZN15WebChromeClientC1EP7WebView
__ZN15WebChromeClientC2EP7WebView
__ZN20WebContextMenuClientC1EP7WebView
@@ -744,8 +744,8 @@ __ZN20WebFrameLoaderClient20frameLoaderDestroyedEv
__ZN20WebFrameLoaderClientD0Ev
-[WebFrame dealloc]
-[WebFramePrivate dealloc]
-__ZN30WebGeolocationControllerClient20geolocationDestroyedEv
-__ZN30WebGeolocationControllerClientD0Ev
+__ZN30WebGeolocationClient20geolocationDestroyedEv
+__ZN30WebGeolocationClientD0Ev
__ZN20WebContextMenuClient20contextMenuDestroyedEv
__ZN20WebContextMenuClientD0Ev
__ZN13WebDragClient23dragControllerDestroyedEv
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 33ebc3d..0498554 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -60,7 +60,7 @@
#import "WebFormDelegatePrivate.h"
#import "WebFrameInternal.h"
#import "WebFrameViewInternal.h"
-#import "WebGeolocationControllerClient.h"
+#import "WebGeolocationClient.h"
#import "WebGeolocationPositionInternal.h"
#import "WebHTMLRepresentation.h"
#import "WebHTMLViewInternal.h"
@@ -707,7 +707,7 @@ static NSString *leakMailQuirksUserScriptPath()
pageClients.inspectorClient = new WebInspectorClient(self);
pageClients.pluginHalterClient = new WebPluginHalterClient(self);
#if ENABLE(CLIENT_BASED_GEOLOCATION)
- pageClients.geolocationControllerClient = new WebGeolocationControllerClient(self);
+ pageClients.geolocationClient = new WebGeolocationClient(self);
#endif
#if ENABLE(DEVICE_ORIENTATION)
pageClients.deviceOrientationClient = new WebDeviceOrientationClient(self);
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 815cc19..4a1747a 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-12 John Knottenbelt <jknotten at chromium.org>
+
+ Reviewed by Steve Block.
+
+ Rename GeolocationControllerClient to GeolocationClient.
+ https://bugs.webkit.org/show_bug.cgi?id=49259
+
+ * WebCoreSupport/WebGeolocationClient.cpp: Renamed from WebKit/win/WebCoreSupport/WebGeolocationControllerClient.cpp.
+ (WebGeolocationClient::WebGeolocationClient):
+ (WebGeolocationClient::geolocationDestroyed):
+ (WebGeolocationClient::startUpdating):
+ (WebGeolocationClient::stopUpdating):
+ (WebGeolocationClient::lastPosition):
+ * WebCoreSupport/WebGeolocationClient.h: Renamed from WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h.
+ (WebGeolocationClient::setEnableHighAccuracy):
+ * WebKit.vcproj/WebKit.vcproj:
+ * WebView.cpp:
+ (WebView::initWithFrame):
+
2010-11-10 Csaba Osztrogonác <ossy at webkit.org>
Reviewed by David Hyatt.
diff --git a/WebKit/win/WebCoreSupport/WebGeolocationClient.cpp b/WebKit/win/WebCoreSupport/WebGeolocationClient.cpp
new file mode 100644
index 0000000..8a526c4
--- /dev/null
+++ b/WebKit/win/WebCoreSupport/WebGeolocationClient.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+#include "config.h"
+#include "WebKitDLL.h"
+#include "WebGeolocationClient.h"
+
+#include "WebGeolocationPosition.h"
+#include "WebView.h"
+
+using namespace WebCore;
+
+WebGeolocationClient::WebGeolocationClient(WebView* webView)
+ : m_webView(webView)
+{
+}
+
+void WebGeolocationClient::geolocationDestroyed()
+{
+ delete this;
+}
+
+void WebGeolocationClient::startUpdating()
+{
+ COMPtr<IWebGeolocationProvider> provider;
+ if (FAILED(m_webView->geolocationProvider(&provider)))
+ return;
+ provider->registerWebView(m_webView.get());
+}
+
+void WebGeolocationClient::stopUpdating()
+{
+ COMPtr<IWebGeolocationProvider> provider;
+ if (FAILED(m_webView->geolocationProvider(&provider)))
+ return;
+ provider->unregisterWebView(m_webView.get());
+}
+
+GeolocationPosition* WebGeolocationClient::lastPosition()
+{
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+ COMPtr<IWebGeolocationProvider> provider;
+ if (FAILED(m_webView->geolocationProvider(&provider)))
+ return 0;
+ COMPtr<IWebGeolocationPosition> position;
+ if (FAILED(provider->lastPosition(&position)))
+ return 0;
+ return core(position.get());
+#else
+ return 0;
+#endif
+}
diff --git a/WebKit/win/WebCoreSupport/WebGeolocationClient.h b/WebKit/win/WebCoreSupport/WebGeolocationClient.h
new file mode 100644
index 0000000..2422ae5
--- /dev/null
+++ b/WebKit/win/WebCoreSupport/WebGeolocationClient.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2010 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 WebGeolocationClient_h
+#define WebGeolocationClient_h
+
+#include "COMPtr.h"
+#include <WebCore/GeolocationClient.h>
+
+namespace WebCore {
+ class GeolocationPosition;
+}
+
+class WebView;
+
+class WebGeolocationClient : public WebCore::GeolocationClient {
+public:
+ WebGeolocationClient(WebView*);
+
+ virtual void geolocationDestroyed();
+ virtual void startUpdating();
+ virtual void stopUpdating();
+ virtual void setEnableHighAccuracy(bool) { }
+ virtual WebCore::GeolocationPosition* lastPosition();
+
+private:
+ COMPtr<WebView> m_webView;
+};
+
+#endif // WebGeolocationClient_h
diff --git a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.cpp b/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.cpp
deleted file mode 100644
index daacd6c..0000000
--- a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-#include "config.h"
-#include "WebKitDLL.h"
-#include "WebGeolocationControllerClient.h"
-
-#include "WebGeolocationPosition.h"
-#include "WebView.h"
-
-using namespace WebCore;
-
-WebGeolocationControllerClient::WebGeolocationControllerClient(WebView* webView)
- : m_webView(webView)
-{
-}
-
-void WebGeolocationControllerClient::geolocationDestroyed()
-{
- delete this;
-}
-
-void WebGeolocationControllerClient::startUpdating()
-{
- COMPtr<IWebGeolocationProvider> provider;
- if (FAILED(m_webView->geolocationProvider(&provider)))
- return;
- provider->registerWebView(m_webView.get());
-}
-
-void WebGeolocationControllerClient::stopUpdating()
-{
- COMPtr<IWebGeolocationProvider> provider;
- if (FAILED(m_webView->geolocationProvider(&provider)))
- return;
- provider->unregisterWebView(m_webView.get());
-}
-
-GeolocationPosition* WebGeolocationControllerClient::lastPosition()
-{
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
- COMPtr<IWebGeolocationProvider> provider;
- if (FAILED(m_webView->geolocationProvider(&provider)))
- return 0;
- COMPtr<IWebGeolocationPosition> position;
- if (FAILED(provider->lastPosition(&position)))
- return 0;
- return core(position.get());
-#else
- return 0;
-#endif
-}
diff --git a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h b/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h
deleted file mode 100644
index ed73454..0000000
--- a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2010 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 WebGeolocationControllerClient_h
-#define WebGeolocationControllerClient_h
-
-#include "COMPtr.h"
-#include <WebCore/GeolocationControllerClient.h>
-
-namespace WebCore {
- class GeolocationPosition;
-}
-
-class WebView;
-
-class WebGeolocationControllerClient : public WebCore::GeolocationControllerClient {
-public:
- WebGeolocationControllerClient(WebView*);
-
- virtual void geolocationDestroyed();
- virtual void startUpdating();
- virtual void stopUpdating();
- virtual void setEnableHighAccuracy(bool) { }
- virtual WebCore::GeolocationPosition* lastPosition();
-
-private:
- COMPtr<WebView> m_webView;
-};
-
-#endif // WebGeolocationControllerClient_h
diff --git a/WebKit/win/WebKit.vcproj/WebKit.vcproj b/WebKit/win/WebKit.vcproj/WebKit.vcproj
index 9740947..471ba28 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.vcproj
+++ b/WebKit/win/WebKit.vcproj/WebKit.vcproj
@@ -1296,11 +1296,11 @@
>
</File>
<File
- RelativePath="..\WebCoreSupport\WebGeolocationControllerClient.cpp"
+ RelativePath="..\WebCoreSupport\WebGeolocationClient.cpp"
>
</File>
<File
- RelativePath="..\WebCoreSupport\WebGeolocationControllerClient.h"
+ RelativePath="..\WebCoreSupport\WebGeolocationClient.h"
>
</File>
<File
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 7ce7812..20c8d17 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -42,7 +42,7 @@
#include "WebEditorClient.h"
#include "WebElementPropertyBag.h"
#include "WebFrame.h"
-#include "WebGeolocationControllerClient.h"
+#include "WebGeolocationClient.h"
#include "WebGeolocationPosition.h"
#include "WebIconDatabase.h"
#include "WebInspector.h"
@@ -2594,7 +2594,7 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
pageClients.inspectorClient = new WebInspectorClient(this);
pageClients.pluginHalterClient = new WebPluginHalterClient(this);
#if ENABLE(CLIENT_BASED_GEOLOCATION)
- pageClients.geolocationControllerClient = new WebGeolocationControllerClient(this);
+ pageClients.geolocationClient = new WebGeolocationClient(this);
#endif
m_page = new Page(pageClients);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list