Commit a061b8ba authored by ddkilzer@apple.com's avatar ddkilzer@apple.com

Fix Mac builds by backing out r44093

        * bindings/js/JSCustomPositionCallback.cpp:
        * bindings/js/JSCustomPositionCallback.h:
        * bindings/js/JSCustomPositionErrorCallback.cpp:
        * bindings/js/JSCustomPositionErrorCallback.h:
        * bindings/js/JSGeolocationCustom.cpp:
        * page/Geolocation.cpp:
        * page/Geolocation.idl:
        * page/Geoposition.cpp:
        * page/Geoposition.h:
        * page/Geoposition.idl:
        * page/Navigator.cpp:
        (WebCore::Navigator::disconnectFrame):
        (WebCore::Navigator::geolocation):
        * page/PositionError.idl:
        * platform/GeolocationService.cpp:
        (WebCore::GeolocationService::create):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44094 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2c1bd0b3
2009-05-23 David Kilzer <ddkilzer@apple.com>
Fix Mac builds by backing out r44093
* bindings/js/JSCustomPositionCallback.cpp:
* bindings/js/JSCustomPositionCallback.h:
* bindings/js/JSCustomPositionErrorCallback.cpp:
* bindings/js/JSCustomPositionErrorCallback.h:
* bindings/js/JSGeolocationCustom.cpp:
* page/Geolocation.cpp:
* page/Geolocation.idl:
* page/Geoposition.cpp:
* page/Geoposition.h:
* page/Geoposition.idl:
* page/Navigator.cpp:
(WebCore::Navigator::disconnectFrame):
(WebCore::Navigator::geolocation):
* page/PositionError.idl:
* platform/GeolocationService.cpp:
(WebCore::GeolocationService::create):
2009-05-23 Laszlo Gombos <laszlo.1.gombos@nokia.com>
Reviewed by Eric Seidel.
......@@ -26,8 +26,6 @@
#include "config.h"
#include "JSCustomPositionCallback.h"
#if ENABLE(GEOLOCATION)
#include "Frame.h"
#include "JSGeoposition.h"
#include "ScriptController.h"
......@@ -86,5 +84,3 @@ void JSCustomPositionCallback::handleEvent(Geoposition* geoposition, bool& raise
}
} // namespace WebCore
#endif // ENABLE(GEOLOCATION)
......@@ -26,8 +26,6 @@
#ifndef JSCustomPositionCallback_h
#define JSCustomPositionCallback_h
#if ENABLE(GEOLOCATION)
#include "PositionCallback.h"
#include <runtime/JSObject.h>
#include <runtime/Protect.h>
......@@ -57,6 +55,4 @@ private:
} // namespace WebCore
#endif // ENABLE(GEOLOCATION)
#endif // JSCustomPositionCallback_h
......@@ -26,8 +26,6 @@
#include "config.h"
#include "JSCustomPositionErrorCallback.h"
#if ENABLE(GEOLOCATION)
#include "Frame.h"
#include "JSPositionError.h"
#include "ScriptController.h"
......@@ -84,5 +82,3 @@ void JSCustomPositionErrorCallback::handleEvent(PositionError* positionError)
}
} // namespace WebCore
#endif // ENABLE(GEOLOCATION)
......@@ -26,8 +26,6 @@
#ifndef JSCustomPositionErrorCallback_h
#define JSCustomPositionErrorCallback_h
#if ENABLE(GEOLOCATION)
#include "PositionErrorCallback.h"
#include <runtime/JSObject.h>
#include <runtime/Protect.h>
......@@ -57,6 +55,4 @@ private:
} // namespace WebCore
#endif // ENABLE(GEOLOCATION)
#endif // JSCustomPositionErrorCallback_h
......@@ -26,8 +26,6 @@
#include "config.h"
#include "JSGeolocation.h"
#if ENABLE(GEOLOCATION)
#include "DOMWindow.h"
#include "ExceptionCode.h"
#include "Geolocation.h"
......@@ -150,5 +148,3 @@ JSValue JSGeolocation::watchPosition(ExecState* exec, const ArgList& args)
}
} // namespace WebCore
#endif // ENABLE(GEOLOCATION)
......@@ -26,8 +26,6 @@
#include "config.h"
#include "Geolocation.h"
#if ENABLE(GEOLOCATION)
#include "Chrome.h"
#include "Document.h"
#include "Frame.h"
......@@ -297,5 +295,3 @@ void Geolocation::geolocationServiceErrorOccurred(GeolocationService* service)
}
} // namespace WebCore
#endif // ENABLE(GEOLOCATION)
......@@ -25,7 +25,7 @@
module core {
interface [Conditional=GEOLOCATION] Geolocation {
interface Geolocation {
readonly attribute Geoposition lastPosition;
[Custom] void getCurrentPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
......
......@@ -26,8 +26,6 @@
#include "config.h"
#include "Geoposition.h"
#if ENABLE(GEOLOCATION)
namespace WebCore {
String Geoposition::toString() const
......@@ -36,5 +34,3 @@ String Geoposition::toString() const
}
} // namespace WebCore
#endif // ENABLE(GEOLOCATION)
......@@ -26,8 +26,6 @@
#ifndef Geoposition_h
#define Geoposition_h
#if ENABLE(GEOLOCATION)
#include "Coordinates.h"
#include "Event.h"
#include "PlatformString.h"
......@@ -59,6 +57,4 @@ private:
} // namespace WebCore
#endif // ENABLE(GEOLOCATION)
#endif // Geoposition_h
......@@ -25,7 +25,7 @@
module core {
interface [Conditional=GEOLOCATION] Geoposition {
interface Geoposition {
readonly attribute Coordinates coords;
readonly attribute DOMTimeStamp timestamp;
......
......@@ -59,12 +59,10 @@ void Navigator::disconnectFrame()
m_mimeTypes->disconnectFrame();
m_mimeTypes = 0;
}
#if ENABLE(GEOLOCATION)
if (m_geolocation) {
m_geolocation->disconnectFrame();
m_geolocation = 0;
}
#endif
m_frame = 0;
}
......@@ -148,10 +146,8 @@ bool Navigator::javaEnabled() const
Geolocation* Navigator::geolocation() const
{
#if ENABLE(GEOLOCATION)
if (!m_geolocation)
m_geolocation = Geolocation::create(m_frame);
#endif
return m_geolocation.get();
}
......
......@@ -26,8 +26,7 @@
module core {
interface [
GenerateConstructor,
Conditional=GEOLOCATION
GenerateConstructor
] PositionError {
readonly attribute unsigned short code;
readonly attribute DOMString message;
......
......@@ -26,12 +26,17 @@
#include "config.h"
#include "GeolocationService.h"
#if ENABLE(GEOLOCATION)
#include <wtf/Assertions.h>
namespace WebCore {
#if !ENABLE(GEOLOCATION)
GeolocationService* GeolocationService::create(GeolocationServiceClient*)
{
return 0;
}
#endif
GeolocationService::GeolocationService(GeolocationServiceClient* client)
: m_geolocationServiceClient(client)
{
......@@ -49,5 +54,3 @@ void GeolocationService::errorOccurred()
}
} // namespace WebCore
#endif // ENABLE(GEOLOCATION)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment