Attachment #75926 for bug #45752

View Details Raw Unified Return to Bug 45752

| Differences between



2010-12-06  John Knottenbelt  <jknotten@chromium.org>

        Reviewed by NOBODY (OOPS!).

        [chromium] Implement client based geolocation bindings
        https://bugs.webkit.org/show_bug.cgi?id=45752

        Implements the necessary plumbing to expose client-based geolocation in Chromium
        webkit. The plan is to remove the non-client-based geolocation code (GeolocationService*)
        in the future.

        * WebKit.gyp:
        * public/WebGeolocationClient.h: Added.
        (WebKit::WebGeolocationClient::~WebGeolocationClient):
        * public/WebGeolocationController.h: Added.
        (WebKit::WebGeolocationController::WebGeolocationController):
        (WebKit::WebGeolocationController::reset):
        * public/WebGeolocationError.h:
        * public/WebGeolocationPermissionRequest.h: Added.
        (WebKit::WebGeolocationPermissionRequest::WebGeolocationPermissionRequest):
        (WebKit::WebGeolocationPermissionRequest::geolocation):
        * public/WebGeolocationPermissionRequestManager.h: Added.
        (WebKit::WebGeolocationPermissionRequestManager::WebGeolocationPermissionRequestManager):
        (WebKit::WebGeolocationPermissionRequestManager::~WebGeolocationPermissionRequestManager):
        * public/WebGeolocationPosition.h:
        * public/WebViewClient.h:
        (WebKit::WebViewClient::geolocationClient):
        * src/ChromeClientImpl.cpp:
        (WebKit::ChromeClientImpl::requestGeolocationPermissionForFrame):
        (WebKit::ChromeClientImpl::cancelGeolocationPermissionRequestForFrame):
        * src/GeolocationClientProxy.cpp: Added.
        (WebKit::GeolocationClientProxy::GeolocationClientProxy):
        (WebKit::GeolocationClientProxy::~GeolocationClientProxy):
        (WebKit::GeolocationClientProxy::setController):
        (WebKit::GeolocationClientProxy::geolocationDestroyed):
        (WebKit::GeolocationClientProxy::startUpdating):
        (WebKit::GeolocationClientProxy::stopUpdating):
        (WebKit::GeolocationClientProxy::setEnableHighAccuracy):
        (WebKit::GeolocationClientProxy::lastPosition):
        (WebKit::GeolocationClientProxy::requestPermission):
        (WebKit::GeolocationClientProxy::cancelPermissionRequest):
        * src/GeolocationClientProxy.h: Added.
        * src/WebGeolocationController.cpp: Added.
        (WebKit::WebGeolocationController::positionChanged):
        (WebKit::WebGeolocationController::errorOccurred):
        (WebKit::WebGeolocationController::controller):
        * src/WebGeolocationPermissionRequest.cpp: Added.
        (WebKit::WebGeolocationPermissionRequest::securityOrigin):
        (WebKit::WebGeolocationPermissionRequest::setIsAllowed):
        * src/WebGeolocationPermissionRequestManager.cpp: Added.
        (WebGeolocationPermissionRequestManager::add):
        (WebGeolocationPermissionRequestManager::remove):
        (WebGeolocationPermissionRequestManager::init):
        (WebGeolocationPermissionRequestManager::reset):
        * src/WebViewImpl.cpp:
        (WebKit::WebViewImpl::WebViewImpl):
        * src/WebViewImpl.h:

2010-12-06  Darin Adler  <darin@apple.com>

        Reviewed by Sam Weinig.

Lines 173-179 a/WebKit/chromium/WebKit.gyp_sec1
- a/WebKit/chromium/WebKit.gyp +13 lines
173	'public/WebFontCache.h',	173	'public/WebFontCache.h',
174	'public/WebFormControlElement.h',	174	'public/WebFormControlElement.h',
175	'public/WebFormElement.h',	175	'public/WebFormElement.h',
		176	'public/WebGeolocationClient.h',
		177	'public/WebGeolocationController.h',
176	'public/WebGeolocationError.h',	178	'public/WebGeolocationError.h',
		179	'public/WebGeolocationPermissionRequest.h',
		180	'public/WebGeolocationPermissionRequestManager.h',
177	'public/WebGeolocationPosition.h',	181	'public/WebGeolocationPosition.h',
178	'public/WebGeolocationService.h',	182	'public/WebGeolocationService.h',
179	'public/WebGeolocationServiceBridge.h',	183	'public/WebGeolocationServiceBridge.h',
Lines 339-344 a/WebKit/chromium/WebKit.gyp_sec2
339	'src/FrameLoaderClientImpl.cpp',	343	'src/FrameLoaderClientImpl.cpp',
340	'src/FrameLoaderClientImpl.h',	344	'src/FrameLoaderClientImpl.h',
341	'src/FrameNetworkingContextImpl.h',	345	'src/FrameNetworkingContextImpl.h',
		346	'src/GeolocationClientProxy.cpp',
		347	'src/GeolocationClientProxy.h',
342	'src/GraphicsContext3DChromium.cpp',	348	'src/GraphicsContext3DChromium.cpp',
343	'src/GraphicsContext3DInternal.h',	349	'src/GraphicsContext3DInternal.h',
344	'src/gtk/WebFontInfo.cpp',	350	'src/gtk/WebFontInfo.cpp',
Lines 444-450 a/WebKit/chromium/WebKit.gyp_sec3
444	'src/WebFormElement.cpp',	450	'src/WebFormElement.cpp',
445	'src/WebFrameImpl.cpp',	451	'src/WebFrameImpl.cpp',
446	'src/WebFrameImpl.h',	452	'src/WebFrameImpl.h',
		453	'src/WebGeolocationController.cpp',
447	'src/WebGeolocationError.cpp',	454	'src/WebGeolocationError.cpp',
		455	'src/WebGeolocationPermissionRequest.cpp',
		456	'src/WebGeolocationPermissionRequestManager.cpp',
448	'src/WebGeolocationPosition.cpp',	457	'src/WebGeolocationPosition.cpp',
449	'src/WebGeolocationServiceBridgeImpl.cpp',	458	'src/WebGeolocationServiceBridgeImpl.cpp',
450	'src/WebGeolocationServiceBridgeImpl.h',	459	'src/WebGeolocationServiceBridgeImpl.h',
Lines 671-677 a/WebKit/chromium/WebKit.gyp_sec4
671	],	680	],
672	}, {	681	}, {
673	'sources/': [	682	'sources/': [
		683	['exclude', 'GeolocationClientProxy.*'],
		684	['exclude', 'WebGeolocationClient.*'],
		685	['exclude', 'WebGeolocationController.*'],
674	['exclude', 'WebGeolocationError.*'],	686	['exclude', 'WebGeolocationError.*'],
		687	['exclude', 'WebGeolocationPermissionRequest.*'],
675	['exclude', 'WebGeolocationPosition.*'],	688	['exclude', 'WebGeolocationPosition.*'],
676	],	689	],
677	}]	690	}]



/*
 * Copyright (C) 2010 Google 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 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 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

namespace WebKit {
class WebGeolocationController;
class WebGeolocationPermissionRequest;
class WebGeolocationPosition;

class WebGeolocationClient {
public:
    virtual ~WebGeolocationClient() {}

    virtual void startUpdating() = 0;
    virtual void stopUpdating() = 0;
    virtual void setEnableHighAccuracy(bool) = 0;
    virtual void geolocationDestroyed() = 0;
    virtual bool lastPosition(WebGeolocationPosition&) = 0;

    virtual void requestPermission(const WebGeolocationPermissionRequest&) = 0;
    virtual void cancelPermissionRequest(const WebGeolocationPermissionRequest&) = 0;

    // The controller is valid until geolocationDestroyed() is invoked.
    // Ownership of the WebGeolocationController is transferred to the client.
    virtual void setController(WebGeolocationController*) = 0;
};

} // namespace WebKit

#endif // WebGeolocationClient_h



/*
 * Copyright (C) 2010 Google 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 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 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 WebGeolocationController_h
#define WebGeolocationController_h

#include "WebCommon.h"
#include "WebNonCopyable.h"

namespace WebCore { class GeolocationController; }

namespace WebKit {

class WebGeolocationPosition;
class WebGeolocationError;

// Note that the WebGeolocationController is invalid after the
// WebGeolocationClient::geolocationDestroyed() has been received.
class WebGeolocationController : public WebNonCopyable {
public:
    WEBKIT_API void positionChanged(const WebGeolocationPosition&);
    WEBKIT_API void errorOccurred(const WebGeolocationError&);

#if WEBKIT_IMPLEMENTATION
    WebGeolocationController(WebCore::GeolocationController* c)
        : m_private(c)
    {
    }

    WebCore::GeolocationController* controller() const { return m_private; }
#endif

private:
    // No implementation for the default constructor. Declared private to ensure that no instances
    // can be created by the consumers of Chromium WebKit.
    WebGeolocationController();

    WebCore::GeolocationController* m_private;
};

} // namespace WebKit

#endif // WebGeolocationController_h




#if WEBKIT_IMPLEMENTATION
#include <wtf/PassRefPtr.h>
namespace WebCore { class GeolocationError; }
#endif

namespace WebCore { class GeolocationError; }

namespace WebKit {

class WebString;



/*
 * Copyright (C) 2010 Google 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 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 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 WebGeolocationPermissionRequest_h
#define WebGeolocationPermissionRequest_h

#include "WebCommon.h"
#include "WebPrivatePtr.h"

namespace WebCore {
class Geolocation;
}

namespace WebKit {
class WebSecurityOrigin;

// WebGeolocationPermissionRequest encapsulates a WebCore Geolocation object and represents
// a request from WebCore for permission to be determined for that Geolocation object.
// The underlying Geolocation object is guaranteed to be valid until the invocation of
// either  WebGeolocationPermissionRequest::setIsAllowed (request complete) or
// WebGeolocationClient::cancelPermissionRequest (request cancelled).
class WebGeolocationPermissionRequest {
public:
    WEBKIT_API WebSecurityOrigin securityOrigin() const;
    WEBKIT_API void setIsAllowed(bool);

#if WEBKIT_IMPLEMENTATION
    WebGeolocationPermissionRequest(WebCore::Geolocation* geolocation)
        : m_private(geolocation)
    {
    }

    WebCore::Geolocation* geolocation() const { return m_private; }
#endif

private:
    WebCore::Geolocation* m_private;
};
}

#endif // WebGeolocationPermissionRequest_h



/*
 * Copyright (C) 2010 Google 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 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 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 WebGeolocationPermissionRequestManager_h
#define WebGeolocationPermissionRequestManager_h

#include "WebNonCopyable.h"
#include "WebPrivateOwnPtr.h"

namespace WebKit {

class WebGeolocationPermissionRequest;
class WebGeolocationPermissionRequestManagerPrivate;

// This class is used to map between integer identifiers and WebGeolocationPermissionRequest
// instances. The intended usage is that on WebGeolocationClient::requestPermission(),
// the implementer can call add() to associate an id with the WebGeolocationPermissionRequest object.
// Once the permission request has been decided, the second remove() method can be used to
// find the request. On WebGeolocationClient::cancelPermissionRequest, the first remove() method will
// remove the association with the id.
class WebGeolocationPermissionRequestManager : public WebNonCopyable {
public:
    WebGeolocationPermissionRequestManager() { init(); }
    ~WebGeolocationPermissionRequestManager() { reset(); }

    WEBKIT_API int add(const WebKit::WebGeolocationPermissionRequest&);
    WEBKIT_API bool remove(const WebKit::WebGeolocationPermissionRequest&, int&);
    WEBKIT_API bool remove(int, WebKit::WebGeolocationPermissionRequest&);

private:
    WEBKIT_API void init();
    WEBKIT_API void reset();

    WebPrivateOwnPtr<WebGeolocationPermissionRequestManagerPrivate> m_private;
    int m_lastId;
};

}

#endif // WebGeolocationPermissionRequestManager_h





#if WEBKIT_IMPLEMENTATION
#include <wtf/PassRefPtr.h>
namespace WebCore { class GeolocationPosition; }
#endif

namespace WebCore { class GeolocationPosition; }

namespace WebKit {

class WebGeolocationPosition {

Lines 52-57 class WebExternalPopupMenu; a/WebKit/chromium/public/WebViewClient.h_sec1
- a/WebKit/chromium/public/WebViewClient.h -1 / +4 lines
52	class WebExternalPopupMenuClient;	52	class WebExternalPopupMenuClient;
53	class WebFileChooserCompletion;	53	class WebFileChooserCompletion;
54	class WebFrame;	54	class WebFrame;
		55	class WebGeolocationClient;
55	class WebGeolocationService;	56	class WebGeolocationService;
56	class WebImage;	57	class WebImage;
57	class WebInputElement;	58	class WebInputElement;
Lines 340-346 public: a/WebKit/chromium/public/WebViewClient.h_sec2
340		341
341	// Geolocation ---------------------------------------------------------	342	// Geolocation ---------------------------------------------------------
342		343
343	// Access the embedder API for geolocation services.	344	// Access the embedder API for (client-based) geolocation client .
		345	virtual WebGeolocationClient* geolocationClient() { return 0; }
		346	// Access the embedder API for (non-client-based) geolocation services.
344	virtual WebGeolocationService* geolocationService() { return 0; }	347	virtual WebGeolocationService* geolocationService() { return 0; }
345		348
346	// Speech --------------------------------------------------------------	349	// Speech --------------------------------------------------------------



}
#endif

// FIXME: Remove ChromeClientImpl::requestGeolocationPermissionForFrame and ChromeClientImpl::cancelGeolocationPermissionRequestForFrame
// once all ports have moved to client-based geolocation (see https://bugs.webkit.org/show_bug.cgi?id=40373 ).
// For client-based geolocation, these methods are now implemented as WebGeolocationClient::requestPermission and WebGeolocationClient::cancelPermissionRequest.
// (see https://bugs.webkit.org/show_bug.cgi?id=50061 ).
void ChromeClientImpl::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation)
{
#if !ENABLE(CLIENT_BASED_GEOLOCATION)
    // FIXME: Implement Client-based Geolocation Permissions
#else
    GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
    geolocationService->geolocationServiceBridge()->attachBridgeIfNeeded();
    m_webView->client()->geolocationService()->requestPermissionForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());


void ChromeClientImpl::cancelGeolocationPermissionRequestForFrame(Frame* frame, Geolocation* geolocation)
{
#if !ENABLE(CLIENT_BASED_GEOLOCATION)
    // FIXME: Implement Client-based Geolocation Permissions
#else
    GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
    m_webView->client()->geolocationService()->cancelPermissionRequestForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
#endif



/*
 * Copyright (C) 2010 Google 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 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 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 "GeolocationClientProxy.h"

#include "Geolocation.h"
#include "GeolocationPosition.h"
#include "WebGeolocationClient.h"
#include "WebGeolocationController.h"
#include "WebGeolocationPermissionRequest.h"
#include "WebGeolocationPosition.h"

namespace WebKit {

GeolocationClientProxy::GeolocationClientProxy(WebGeolocationClient* client)
    : m_client(client)
{
}

GeolocationClientProxy::~GeolocationClientProxy()
{
}

void GeolocationClientProxy::setController(WebCore::GeolocationController* controller)
{
    // We support there not being a client, provided we don't do any Geolocation.
    if (m_client) {
        // Ownership of the WebGeolocationController is transferred to the client.
        m_client->setController(new WebGeolocationController(controller));
    }
}

void GeolocationClientProxy::geolocationDestroyed()
{
    m_client->geolocationDestroyed();
}

void GeolocationClientProxy::startUpdating()
{
    m_client->startUpdating();
}

void GeolocationClientProxy::stopUpdating()
{
    m_client->stopUpdating();
}

void GeolocationClientProxy::setEnableHighAccuracy(bool highAccuracy)
{
    m_client->setEnableHighAccuracy(highAccuracy);
}

WebCore::GeolocationPosition* GeolocationClientProxy::lastPosition()
{
    WebGeolocationPosition webPosition;
    if (m_client->lastPosition(webPosition))
        m_lastPosition = webPosition;
    else
        m_lastPosition.clear();

    return m_lastPosition.get();
}

void GeolocationClientProxy::requestPermission(WebCore::Geolocation* geolocation)
{
    m_client->requestPermission(WebGeolocationPermissionRequest(geolocation));
}

void GeolocationClientProxy::cancelPermissionRequest(WebCore::Geolocation* geolocation)
{
    m_client->cancelPermissionRequest(WebGeolocationPermissionRequest(geolocation));
}

}



/*
 * Copyright (C) 2010 Google 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 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 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 GeolocationClientProxy_h
#define GeolocationClientProxy_h

#include "GeolocationClient.h"
#include "WebGeolocationController.h"
#include <wtf/RefPtr.h>

namespace WebCore {
class GeolocationPosition;
}

namespace WebKit {
class WebGeolocationClient;

class GeolocationClientProxy : public WebCore::GeolocationClient {
public:
    GeolocationClientProxy(WebGeolocationClient* client);
    ~GeolocationClientProxy();
    void setController(WebCore::GeolocationController *controller);
    virtual void geolocationDestroyed();
    virtual void startUpdating();
    virtual void stopUpdating();
    virtual void setEnableHighAccuracy(bool);
    virtual WebCore::GeolocationPosition* lastPosition();

    virtual void requestPermission(WebCore::Geolocation*);
    virtual void cancelPermissionRequest(WebCore::Geolocation*);

private:
    WebGeolocationClient* m_client;
    RefPtr<WebCore::GeolocationPosition> m_lastPosition;
};

} // namespace WebKit

#endif // GeolocationClientProxy_h



/*
 * Copyright (C) 2010 Google 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 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 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 "WebGeolocationController.h"

#include "GeolocationController.h"
#include "GeolocationError.h"
#include "GeolocationPosition.h"
#include "WebGeolocationError.h"
#include "WebGeolocationPosition.h"

#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>

using namespace WebCore;

namespace WebKit {

void WebGeolocationController::positionChanged(const WebGeolocationPosition& webPosition)
{
    m_private->positionChanged(PassRefPtr<GeolocationPosition>(webPosition).get());
}

void WebGeolocationController::errorOccurred(const WebGeolocationError& webError)
{
    m_private->errorOccurred(PassRefPtr<GeolocationError>(webError).get());
}

} // namespace WebKit



/*
 * Copyright (C) 2010 Google 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 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 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 "WebGeolocationPermissionRequest.h"

#include "Document.h"
#include "Frame.h"
#include "Geolocation.h"
#include "WebSecurityOrigin.h"
#include "WebURL.h"

using namespace WebCore;

namespace WebKit {

WebSecurityOrigin WebGeolocationPermissionRequest::securityOrigin() const
{
    return WebSecurityOrigin::create(m_private->frame()->document()->url());
}

void WebGeolocationPermissionRequest::setIsAllowed(bool allowed)
{
    m_private->setIsAllowed(allowed);
}

}



/*
 * Copyright (C) 2010 Google 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 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 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 "WebGeolocationPermissionRequestManager.h"

#include "WebGeolocationPermissionRequest.h"
#include <wtf/HashMap.h>

namespace WebCore {
class Geolocation;
}

using namespace WebCore;

typedef HashMap<Geolocation*, int> GeolocationIdMap;
typedef HashMap<int, Geolocation*> IdGeolocationMap;

namespace WebKit {
class WebGeolocationPermissionRequestManagerPrivate {
public:
    GeolocationIdMap m_geolocationIdMap;
    IdGeolocationMap m_idGeolocationMap;
};
}

using namespace WebKit;

int WebGeolocationPermissionRequestManager::add(const WebKit::WebGeolocationPermissionRequest& permissionRequest)
{
    Geolocation* geolocation = permissionRequest.geolocation();
    ASSERT(!m_private->m_geolocationIdMap.contains(geolocation));
    int id = ++m_lastId;
    m_private->m_geolocationIdMap.add(geolocation, id);
    m_private->m_idGeolocationMap.add(id, geolocation);
    return id;
}

bool WebGeolocationPermissionRequestManager::remove(const WebKit::WebGeolocationPermissionRequest& permissionRequest, int& id)
{
    Geolocation* geolocation = permissionRequest.geolocation();
    GeolocationIdMap::iterator it = m_private->m_geolocationIdMap.find(geolocation);
    if (it == m_private->m_geolocationIdMap.end())
        return false;
    id = it->second;
    m_private->m_geolocationIdMap.remove(it);
    m_private->m_idGeolocationMap.remove(id);
    return true;
}

bool WebGeolocationPermissionRequestManager::remove(int id, WebKit::WebGeolocationPermissionRequest& permissionRequest)
{
    IdGeolocationMap::iterator it = m_private->m_idGeolocationMap.find(id);
    if (it == m_private->m_idGeolocationMap.end())
        return false;
    Geolocation* geolocation = it->second;
    permissionRequest = WebGeolocationPermissionRequest(geolocation);
    m_private->m_idGeolocationMap.remove(it);
    m_private->m_geolocationIdMap.remove(geolocation);
    return true;
}

void WebGeolocationPermissionRequestManager::init()
{
    m_lastId = 0;
    m_private.reset(new WebGeolocationPermissionRequestManagerPrivate);
}

void WebGeolocationPermissionRequestManager::reset()
{
    m_private.reset(0);
}


Lines 59-64 a/WebKit/chromium/src/WebViewImpl.cpp_sec1
- a/WebKit/chromium/src/WebViewImpl.cpp +11 lines
59	#include "FrameLoader.h"	59	#include "FrameLoader.h"
60	#include "FrameTree.h"	60	#include "FrameTree.h"
61	#include "FrameView.h"	61	#include "FrameView.h"
		62	#include "GeolocationClientProxy.h"
62	#include "GraphicsContext.h"	63	#include "GraphicsContext.h"
63	#include "GraphicsContext3D.h"	64	#include "GraphicsContext3D.h"
64	#include "GraphicsContext3DInternal.h"	65	#include "GraphicsContext3DInternal.h"
Lines 310-315 WebViewImpl::WebViewImpl(WebViewClient* client, WebDevToolsAgentClient* devTools a/WebKit/chromium/src/WebViewImpl.cpp_sec2
310	, m_speechInputClient(SpeechInputClientImpl::create(client))	311	, m_speechInputClient(SpeechInputClientImpl::create(client))
311	#endif	312	#endif
312	, m_deviceOrientationClientProxy(new DeviceOrientationClientProxy(client ? client->deviceOrientationClient() : 0))	313	, m_deviceOrientationClientProxy(new DeviceOrientationClientProxy(client ? client->deviceOrientationClient() : 0))
		314	#if ENABLE(CLIENT_BASED_GEOLOCATION)
		315	, m_geolocationClientProxy(new GeolocationClientProxy(client ? client->geolocationClient() : 0))
		316	#endif
313	{	317	{
314	// WebKit/win/WebView.cpp does the same thing, except they call the	318	// WebKit/win/WebView.cpp does the same thing, except they call the
315	// KJS specific wrapper around this method. We need to have threading	319	// KJS specific wrapper around this method. We need to have threading
Lines 333-341 WebViewImpl::WebViewImpl(WebViewClient* client, WebDevToolsAgentClient* devTools a/WebKit/chromium/src/WebViewImpl.cpp_sec3
333	pageClients.speechInputClient = m_speechInputClient.get();	337	pageClients.speechInputClient = m_speechInputClient.get();
334	#endif	338	#endif
335	pageClients.deviceOrientationClient = m_deviceOrientationClientProxy.get();	339	pageClients.deviceOrientationClient = m_deviceOrientationClientProxy.get();
		340	#if ENABLE(CLIENT_BASED_GEOLOCATION)
		341	pageClients.geolocationClient = m_geolocationClientProxy.get();
		342	#endif
336		343
337	m_page.set(new Page(pageClients));	344	m_page.set(new Page(pageClients));
338		345
		346	#if ENABLE(CLIENT_BASED_GEOLOCATION)
		347	m_geolocationClientProxy->setController(m_page->geolocationController());
		348	#endif
		349
339	static_cast<BackForwardListImpl*>(m_page->backForwardList())->setClient(&m_backForwardListClientImpl);	350	static_cast<BackForwardListImpl*>(m_page->backForwardList())->setClient(&m_backForwardListClientImpl);
340	m_page->setGroupName(pageGroupName);	351	m_page->setGroupName(pageGroupName);
341		352

Lines 73-78 class AutoFillPopupMenuClient; a/WebKit/chromium/src/WebViewImpl.h_sec1
- a/WebKit/chromium/src/WebViewImpl.h +5 lines
73	class ContextMenuClientImpl;	73	class ContextMenuClientImpl;
74	class DeviceOrientationClientProxy;	74	class DeviceOrientationClientProxy;
75	class DragScrollTimer;	75	class DragScrollTimer;
		76	class GeolocationClientProxy;
76	class SpeechInputClientImpl;	77	class SpeechInputClientImpl;
77	class WebAccessibilityObject;	78	class WebAccessibilityObject;
78	class WebDevToolsAgentClient;	79	class WebDevToolsAgentClient;
Lines 555-560 private: a/WebKit/chromium/src/WebViewImpl.h_sec2
555	// early. This member holds on to the GC3D in this case.	556	// early. This member holds on to the GC3D in this case.
556	RefPtr<WebCore::GraphicsContext3D> m_temporaryOnscreenGraphicsContext3D;	557	RefPtr<WebCore::GraphicsContext3D> m_temporaryOnscreenGraphicsContext3D;
557	OwnPtr<DeviceOrientationClientProxy> m_deviceOrientationClientProxy;	558	OwnPtr<DeviceOrientationClientProxy> m_deviceOrientationClientProxy;
		559
		560	#if ENABLE(CLIENT_BASED_GEOLOCATION)
		561	OwnPtr<GeolocationClientProxy> m_geolocationClientProxy;
		562	#endif
558	};	563	};
559		564
560	} // namespace WebKit	565	} // namespace WebKit

Return to Bug 45752

Lines 776-786 NotificationPresenter* ChromeClientImpl::notificationPresenter() const a/WebKit/chromium/src/ChromeClientImpl.cpp_sec1
- a/WebKit/chromium/src/ChromeClientImpl.cpp -6 / +6 lines
776	}	776	}
777	#endif	777	#endif
778		778
		779	// FIXME: Remove ChromeClientImpl::requestGeolocationPermissionForFrame and ChromeClientImpl::cancelGeolocationPermissionRequestForFrame
		780	// once all ports have moved to client-based geolocation (see https://bugs.webkit.org/show_bug.cgi?id=40373 ).
		781	// For client-based geolocation, these methods are now implemented as WebGeolocationClient::requestPermission and WebGeolocationClient::cancelPermissionRequest.
		782	// (see https://bugs.webkit.org/show_bug.cgi?id=50061 ).
779	void ChromeClientImpl::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation)	783	void ChromeClientImpl::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation)
780	{	784	{
781	#if ENABLE(CLIENT_BASED_GEOLOCATION)	785	#if !ENABLE(CLIENT_BASED_GEOLOCATION)
782	// FIXME: Implement Client-based Geolocation Permissions
783	#else
784	GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());	786	GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
785	geolocationService->geolocationServiceBridge()->attachBridgeIfNeeded();	787	geolocationService->geolocationServiceBridge()->attachBridgeIfNeeded();
786	m_webView->client()->geolocationService()->requestPermissionForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());	788	m_webView->client()->geolocationService()->requestPermissionForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
Lines 789-797 void ChromeClientImpl::requestGeolocationPermissionForFrame(Frame* frame, Geoloc a/WebKit/chromium/src/ChromeClientImpl.cpp_sec2
789		791
790	void ChromeClientImpl::cancelGeolocationPermissionRequestForFrame(Frame* frame, Geolocation* geolocation)	792	void ChromeClientImpl::cancelGeolocationPermissionRequestForFrame(Frame* frame, Geolocation* geolocation)
791	{	793	{
792	#if ENABLE(CLIENT_BASED_GEOLOCATION)	794	#if !ENABLE(CLIENT_BASED_GEOLOCATION)
793	// FIXME: Implement Client-based Geolocation Permissions
794	#else
795	GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());	795	GeolocationServiceChromium* geolocationService = static_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
796	m_webView->client()->geolocationService()->cancelPermissionRequestForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());	796	m_webView->client()->geolocationService()->cancelPermissionRequestForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
797	#endif	797	#endif

Lines 1-3 a/WebKit/chromium/ChangeLog_sec1
- a/WebKit/chromium/ChangeLog +58 lines
		1	2010-12-06 John Knottenbelt <jknotten@chromium.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	[chromium] Implement client based geolocation bindings
		6	https://bugs.webkit.org/show_bug.cgi?id=45752
		7
		8	Implements the necessary plumbing to expose client-based geolocation in Chromium
		9	webkit. The plan is to remove the non-client-based geolocation code (GeolocationService*)
		10	in the future.
		11
		12	* WebKit.gyp:
		13	* public/WebGeolocationClient.h: Added.
		14	(WebKit::WebGeolocationClient::~WebGeolocationClient):
		15	* public/WebGeolocationController.h: Added.
		16	(WebKit::WebGeolocationController::WebGeolocationController):
		17	(WebKit::WebGeolocationController::reset):
		18	* public/WebGeolocationError.h:
		19	* public/WebGeolocationPermissionRequest.h: Added.
		20	(WebKit::WebGeolocationPermissionRequest::WebGeolocationPermissionRequest):
		21	(WebKit::WebGeolocationPermissionRequest::geolocation):
		22	* public/WebGeolocationPermissionRequestManager.h: Added.
		23	(WebKit::WebGeolocationPermissionRequestManager::WebGeolocationPermissionRequestManager):
		24	(WebKit::WebGeolocationPermissionRequestManager::~WebGeolocationPermissionRequestManager):
		25	* public/WebGeolocationPosition.h:
		26	* public/WebViewClient.h:
		27	(WebKit::WebViewClient::geolocationClient):
		28	* src/ChromeClientImpl.cpp:
		29	(WebKit::ChromeClientImpl::requestGeolocationPermissionForFrame):
		30	(WebKit::ChromeClientImpl::cancelGeolocationPermissionRequestForFrame):
		31	* src/GeolocationClientProxy.cpp: Added.
		32	(WebKit::GeolocationClientProxy::GeolocationClientProxy):
		33	(WebKit::GeolocationClientProxy::~GeolocationClientProxy):
		34	(WebKit::GeolocationClientProxy::setController):
		35	(WebKit::GeolocationClientProxy::geolocationDestroyed):
		36	(WebKit::GeolocationClientProxy::startUpdating):
		37	(WebKit::GeolocationClientProxy::stopUpdating):
		38	(WebKit::GeolocationClientProxy::setEnableHighAccuracy):
		39	(WebKit::GeolocationClientProxy::lastPosition):
		40	(WebKit::GeolocationClientProxy::requestPermission):
		41	(WebKit::GeolocationClientProxy::cancelPermissionRequest):
		42	* src/GeolocationClientProxy.h: Added.
		43	* src/WebGeolocationController.cpp: Added.
		44	(WebKit::WebGeolocationController::positionChanged):
		45	(WebKit::WebGeolocationController::errorOccurred):
		46	(WebKit::WebGeolocationController::controller):
		47	* src/WebGeolocationPermissionRequest.cpp: Added.
		48	(WebKit::WebGeolocationPermissionRequest::securityOrigin):
		49	(WebKit::WebGeolocationPermissionRequest::setIsAllowed):
		50	* src/WebGeolocationPermissionRequestManager.cpp: Added.
		51	(WebGeolocationPermissionRequestManager::add):
		52	(WebGeolocationPermissionRequestManager::remove):
		53	(WebGeolocationPermissionRequestManager::init):
		54	(WebGeolocationPermissionRequestManager::reset):
		55	* src/WebViewImpl.cpp:
		56	(WebKit::WebViewImpl::WebViewImpl):
		57	* src/WebViewImpl.h:
		58
1	2010-12-06 Darin Adler <darin@apple.com>	59	2010-12-06 Darin Adler <darin@apple.com>
2		60
3	Reviewed by Sam Weinig.	61	Reviewed by Sam Weinig.

Line 0 a/WebKit/chromium/public/WebGeolocationClient.h_sec1
- a/WebKit/chromium/public/WebGeolocationClient.h +54 lines
	1	/*
	2	* Copyright (C) 2010 Google Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	*
	8	* 1. Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* 2. Redistributions in binary form must reproduce the above copyright
	11	* notice, this list of conditions and the following disclaimer in the
	12	* documentation and/or other materials provided with the distribution.
	13	*
	14	* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
	15	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	16	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	17	* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
	18	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	19	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	20	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	21	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
	23	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	#ifndef WebGeolocationClient_h
	27	#define WebGeolocationClient_h
	28
	29	namespace WebKit {
	30	class WebGeolocationController;
	31	class WebGeolocationPermissionRequest;
	32	class WebGeolocationPosition;
	33
	34	class WebGeolocationClient {
	35	public:
	36	virtual ~WebGeolocationClient() {}
	37
	38	virtual void startUpdating() = 0;
	39	virtual void stopUpdating() = 0;
	40	virtual void setEnableHighAccuracy(bool) = 0;
	41	virtual void geolocationDestroyed() = 0;
	42	virtual bool lastPosition(WebGeolocationPosition&) = 0;
	43
	44	virtual void requestPermission(const WebGeolocationPermissionRequest&) = 0;
	45	virtual void cancelPermissionRequest(const WebGeolocationPermissionRequest&) = 0;
	46
	47	// The controller is valid until geolocationDestroyed() is invoked.
	48	// Ownership of the WebGeolocationController is transferred to the client.
	49	virtual void setController(WebGeolocationController*) = 0;
	50	};
	51
	52	} // namespace WebKit
	53
	54	#endif // WebGeolocationClient_h

Lines 31-39 a/WebKit/chromium/public/WebGeolocationError.h_sec1
- a/WebKit/chromium/public/WebGeolocationError.h -1 / +2 lines
31		31
32	#if WEBKIT_IMPLEMENTATION	32	#if WEBKIT_IMPLEMENTATION
33	#include <wtf/PassRefPtr.h>	33	#include <wtf/PassRefPtr.h>
34	namespace WebCore { class GeolocationError; }
35	#endif	34	#endif
36		35
		36	namespace WebCore { class GeolocationError; }
		37
37	namespace WebKit {	38	namespace WebKit {
38		39
39	class WebString;	40	class WebString;

Line 0 a/WebKit/chromium/src/GeolocationClientProxy.cpp_sec1
- a/WebKit/chromium/src/GeolocationClientProxy.cpp +97 lines
		1	/*
		2	* Copyright (C) 2010 Google Inc. All rights reserved.
		3	*
		4	* Redistribution and use in source and binary forms, with or without
		5	* modification, are permitted provided that the following conditions
		6	* are met:
		7	*
		8	* 1. Redistributions of source code must retain the above copyright
		9	* notice, this list of conditions and the following disclaimer.
		10	* 2. Redistributions in binary form must reproduce the above copyright
		11	* notice, this list of conditions and the following disclaimer in the
		12	* documentation and/or other materials provided with the distribution.
		13	*
		14	* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
		15	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
		16	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
		17	* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
		18	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
		19	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		20	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		21	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
		23	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		24	*/
		25
		26	#include "config.h"
		27	#include "GeolocationClientProxy.h"
		28
		29	#include "Geolocation.h"
		30	#include "GeolocationPosition.h"
		31	#include "WebGeolocationClient.h"
		32	#include "WebGeolocationController.h"
		33	#include "WebGeolocationPermissionRequest.h"
		34	#include "WebGeolocationPosition.h"
		35
		36	namespace WebKit {
		37
		38	GeolocationClientProxy::GeolocationClientProxy(WebGeolocationClient* client)
		39	: m_client(client)
		40	{
		41	}
		42
		43	GeolocationClientProxy::~GeolocationClientProxy()
		44	{
		45	}
		46
		47	void GeolocationClientProxy::setController(WebCore::GeolocationController* controller)
		48	{
		49	// We support there not being a client, provided we don't do any Geolocation.
		50	if (m_client) {
		51	// Ownership of the WebGeolocationController is transferred to the client.
		52	m_client->setController(new WebGeolocationController(controller));
		53	}
		54	}
		55
		56	void GeolocationClientProxy::geolocationDestroyed()
		57	{
		58	m_client->geolocationDestroyed();
		59	}
		60
		61	void GeolocationClientProxy::startUpdating()
		62	{
		63	m_client->startUpdating();
		64	}
65
66	void GeolocationClientProxy::stopUpdating()
67	{
68	m_client->stopUpdating();
69	}
70
71	void GeolocationClientProxy::setEnableHighAccuracy(bool highAccuracy)
72	{
73	m_client->setEnableHighAccuracy(highAccuracy);
74	}
75
76	WebCore::GeolocationPosition* GeolocationClientProxy::lastPosition()
77	{
78	WebGeolocationPosition webPosition;
79	if (m_client->lastPosition(webPosition))
80	m_lastPosition = webPosition;
81	else
82	m_lastPosition.clear();
83
84	return m_lastPosition.get();
85	}
86
87	void GeolocationClientProxy::requestPermission(WebCore::Geolocation* geolocation)
88	{
89	m_client->requestPermission(WebGeolocationPermissionRequest(geolocation));
90	}
91
92	void GeolocationClientProxy::cancelPermissionRequest(WebCore::Geolocation* geolocation)
93	{
94	m_client->cancelPermissionRequest(WebGeolocationPermissionRequest(geolocation));
95	}
96
97	}

Line 0 a/WebKit/chromium/src/WebGeolocationController.cpp_sec1
- a/WebKit/chromium/src/WebGeolocationController.cpp +52 lines
	1	/*
	2	* Copyright (C) 2010 Google Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	*
	8	* 1. Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* 2. Redistributions in binary form must reproduce the above copyright
	11	* notice, this list of conditions and the following disclaimer in the
	12	* documentation and/or other materials provided with the distribution.
	13	*
	14	* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
	15	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	16	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	17	* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
	18	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	19	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	20	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	21	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
	23	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	#include "config.h"
	27	#include "WebGeolocationController.h"
	28
	29	#include "GeolocationController.h"
	30	#include "GeolocationError.h"
	31	#include "GeolocationPosition.h"
	32	#include "WebGeolocationError.h"
	33	#include "WebGeolocationPosition.h"
	34
	35	#include <wtf/PassRefPtr.h>
	36	#include <wtf/RefPtr.h>
	37
	38	using namespace WebCore;
	39
	40	namespace WebKit {
	41
	42	void WebGeolocationController::positionChanged(const WebGeolocationPosition& webPosition)
	43	{
	44	m_private->positionChanged(PassRefPtr<GeolocationPosition>(webPosition).get());
	45	}
	46
	47	void WebGeolocationController::errorOccurred(const WebGeolocationError& webError)
	48	{
	49	m_private->errorOccurred(PassRefPtr<GeolocationError>(webError).get());
	50	}
	51
	52	} // namespace WebKit

Line 0 a/WebKit/chromium/src/WebGeolocationPermissionRequest.cpp_sec1
- a/WebKit/chromium/src/WebGeolocationPermissionRequest.cpp +49 lines
	1	/*
	2	* Copyright (C) 2010 Google Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	*
	8	* 1. Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* 2. Redistributions in binary form must reproduce the above copyright
	11	* notice, this list of conditions and the following disclaimer in the
	12	* documentation and/or other materials provided with the distribution.
	13	*
	14	* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
	15	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	16	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	17	* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
	18	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	19	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	20	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	21	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
	23	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	#include "config.h"
	27	#include "WebGeolocationPermissionRequest.h"
	28
	29	#include "Document.h"
	30	#include "Frame.h"
	31	#include "Geolocation.h"
	32	#include "WebSecurityOrigin.h"
	33	#include "WebURL.h"
	34
	35	using namespace WebCore;
	36
	37	namespace WebKit {
	38
	39	WebSecurityOrigin WebGeolocationPermissionRequest::securityOrigin() const
	40	{
	41	return WebSecurityOrigin::create(m_private->frame()->document()->url());
	42	}
	43
	44	void WebGeolocationPermissionRequest::setIsAllowed(bool allowed)
	45	{
	46	m_private->setIsAllowed(allowed);
	47	}
	48
	49	}