Changeset 56803 in webkit


Ignore:
Timestamp:
Mar 30, 2010 12:51:33 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-03-30 Marcus Bulach <​bulach@chromium.org>

Reviewed by Darin Fisher.

Rename / tidy up Geolocation bridge
Uses Geoposition instead of individual params for setLastPosition.
​https://bugs.webkit.org/show_bug.cgi?id=36535

  • platform/chromium/GeolocationServiceChromium.cpp: (WebCore::GeolocationServiceChromium::GeolocationServiceChromium): (WebCore::GeolocationServiceChromium::setIsAllowed): (WebCore::GeolocationServiceChromium::setLastPosition):
  • platform/chromium/GeolocationServiceChromium.h:

2010-03-30 Marcus Bulach <​bulach@chromium.org>

Reviewed by Darin Fisher.

Rename / tidy up Geolocation bridge:
Rename GeolocationServiceBridgeChromium.cpp to WebGeolocationServiceBridgeImpl.cpp
Uses a temporary compatibility layer in GeolocationServiceBridgeChromium.h.

​https://bugs.webkit.org/show_bug.cgi?id=36535

  • WebKit.gyp:
  • public/GeolocationServiceBridgeChromium.h:
  • public/WebGeolocationService.h: Copied from WebKit/chromium/public/GeolocationServiceBridgeChromium.h. (WebKit::WebGeolocationService::detachBridge):
  • public/WebGeolocationServiceBridge.h: Copied from WebKit/chromium/public/GeolocationServiceBridgeChromium.h.
  • public/WebViewClient.h: (WebKit::WebViewClient::geolocationService):
  • src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::requestGeolocationPermissionForFrame):
  • src/ChromiumBridge.cpp:
  • src/GeolocationServiceBridgeChromium.cpp: Removed.
  • src/WebGeolocationServiceBridgeImpl.cpp: Copied from WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp. (WebKit::createGeolocationServiceBridgeImpl): (WebKit::WebGeolocationServiceBridgeImpl::WebGeolocationServiceBridgeImpl): (WebKit::WebGeolocationServiceBridgeImpl::~WebGeolocationServiceBridgeImpl): (WebKit::WebGeolocationServiceBridgeImpl::startUpdating): (WebKit::WebGeolocationServiceBridgeImpl::stopUpdating): (WebKit::WebGeolocationServiceBridgeImpl::suspend): (WebKit::WebGeolocationServiceBridgeImpl::resume): (WebKit::WebGeolocationServiceBridgeImpl::getBridgeId): (WebKit::WebGeolocationServiceBridgeImpl::setIsAllowed): (WebKit::WebGeolocationServiceBridgeImpl::setLastPosition): (WebKit::WebGeolocationServiceBridgeImpl::setLastError): (WebKit::WebGeolocationServiceBridgeImpl::getWebViewClient):
  • src/WebGeolocationServiceBridgeImpl.h: Copied from WebKit/chromium/public/GeolocationServiceBridgeChromium.h.
Location:
trunk
Files:
1 added
9 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r56800 r56803  
     12010-03-30  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Rename / tidy up Geolocation bridge
     6        Uses Geoposition instead of individual params for setLastPosition.
     7        https://bugs.webkit.org/show_bug.cgi?id=36535
     8
     9        * platform/chromium/GeolocationServiceChromium.cpp:
     10        (WebCore::GeolocationServiceChromium::GeolocationServiceChromium):
     11        (WebCore::GeolocationServiceChromium::setIsAllowed):
     12        (WebCore::GeolocationServiceChromium::setLastPosition):
     13        * platform/chromium/GeolocationServiceChromium.h:
     14
    1152010-03-30  Adam Langley  <agl@chromium.org>
    216

  • trunk/WebCore/platform/chromium/GeolocationServiceChromium.cpp

    r56726 r56803  
    11/*
    22 * Copyright (c) 2010, Google Inc. All rights reserved.
    3  * 
     3 *
    44 * Redistribution and use in source and binary forms, with or without
    55 * modification, are permitted provided that the following conditions are
    66 * met:
    7  * 
     7 *
    88 *     * Redistributions of source code must retain the above copyright
    99 * notice, this list of conditions and the following disclaimer.
    … …  
    1515 * contributors may be used to endorse or promote products derived from
    1616 * this software without specific prior written permission.
    17  * 
     17 *
    1818 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    1919 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    … …  
    4646void GeolocationServiceChromium::setIsAllowed(bool allowed)
    4747{
    48     m_geolocation->setIsAllowed(allowed); 
     48    m_geolocation->setIsAllowed(allowed);
    4949}
    5050
    51 void GeolocationServiceChromium::setLastPosition(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed, long long timestamp)
     51void GeolocationServiceChromium::setLastPosition(PassRefPtr<Geoposition> geoposition)
    5252{
    53     m_lastPosition = Geoposition::create(Coordinates::create(latitude, longitude, providesAltitude, altitude, accuracy, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed), timestamp);
     53    m_lastPosition = geoposition;
    5454    positionChanged();
    5555}

  • trunk/WebCore/platform/chromium/GeolocationServiceChromium.h

    r54883 r56803  
    11/*
    22 * Copyright (c) 2010, Google Inc. All rights reserved.
    3  * 
     3 *
    44 * Redistribution and use in source and binary forms, with or without
    55 * modification, are permitted provided that the following conditions are
    66 * met:
    7  * 
     7 *
    88 *     * Redistributions of source code must retain the above copyright
    99 * notice, this list of conditions and the following disclaimer.
    … …  
    1515 * contributors may be used to endorse or promote products derived from
    1616 * this software without specific prior written permission.
    17  * 
     17 *
    1818 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    1919 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    … …  
    6262    GeolocationServiceBridge* geolocationServiceBridge() const { return m_geolocationServiceBridge.get(); }
    6363    void setIsAllowed(bool allowed);
    64     void setLastPosition(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed, long long timestamp);
     64    void setLastPosition(PassRefPtr<Geoposition>);
    6565    void setLastError(int errorCode, const String& message);
    6666    Frame* frame();
    … …  
    7676private:
    7777    Geolocation* m_geolocation;
    78     OwnPtr<GeolocationServiceBridge> m_geolocationServiceBridge;   
     78    OwnPtr<GeolocationServiceBridge> m_geolocationServiceBridge;
    7979    RefPtr<Geoposition> m_lastPosition;
    8080    RefPtr<PositionError> m_lastError;

  • trunk/WebKit/chromium/ChangeLog

    r56782 r56803  
     12010-03-30  Marcus Bulach  <bulach@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Rename / tidy up Geolocation bridge:
     6        Rename GeolocationServiceBridgeChromium.cpp to WebGeolocationServiceBridgeImpl.cpp           
     7        Uses a temporary compatibility layer in GeolocationServiceBridgeChromium.h.
     8
     9        https://bugs.webkit.org/show_bug.cgi?id=36535
     10
     11        * WebKit.gyp:
     12        * public/GeolocationServiceBridgeChromium.h:
     13        * public/WebGeolocationService.h: Copied from WebKit/chromium/public/GeolocationServiceBridgeChromium.h.
     14        (WebKit::WebGeolocationService::detachBridge):
     15        * public/WebGeolocationServiceBridge.h: Copied from WebKit/chromium/public/GeolocationServiceBridgeChromium.h.
     16        * public/WebViewClient.h:
     17        (WebKit::WebViewClient::geolocationService):
     18        * src/ChromeClientImpl.cpp:
     19        (WebKit::ChromeClientImpl::requestGeolocationPermissionForFrame):
     20        * src/ChromiumBridge.cpp:
     21        * src/GeolocationServiceBridgeChromium.cpp: Removed.
     22        * src/WebGeolocationServiceBridgeImpl.cpp: Copied from WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp.
     23        (WebKit::createGeolocationServiceBridgeImpl):
     24        (WebKit::WebGeolocationServiceBridgeImpl::WebGeolocationServiceBridgeImpl):
     25        (WebKit::WebGeolocationServiceBridgeImpl::~WebGeolocationServiceBridgeImpl):
     26        (WebKit::WebGeolocationServiceBridgeImpl::startUpdating):
     27        (WebKit::WebGeolocationServiceBridgeImpl::stopUpdating):
     28        (WebKit::WebGeolocationServiceBridgeImpl::suspend):
     29        (WebKit::WebGeolocationServiceBridgeImpl::resume):
     30        (WebKit::WebGeolocationServiceBridgeImpl::getBridgeId):
     31        (WebKit::WebGeolocationServiceBridgeImpl::setIsAllowed):
     32        (WebKit::WebGeolocationServiceBridgeImpl::setLastPosition):
     33        (WebKit::WebGeolocationServiceBridgeImpl::setLastError):
     34        (WebKit::WebGeolocationServiceBridgeImpl::getWebViewClient):
     35        * src/WebGeolocationServiceBridgeImpl.h: Copied from WebKit/chromium/public/GeolocationServiceBridgeChromium.h.
     36
    1372010-03-30  Jochen Eisinger  <jochen@chromium.org>
    238

  • trunk/WebKit/chromium/WebKit.gyp

    r56777 r56803  
    123123                'public/WebFormControlElement.h',
    124124                'public/WebFormElement.h',
     125                'public/WebGeolocationService.h',
     126                'public/WebGeolocationServiceBridge.h',
    125127                'public/WebGlyphCache.h',
    126128                'public/WebGraphicsContext3D.h',
    … …  
    247249                'src/FrameLoaderClientImpl.cpp',
    248250                'src/FrameLoaderClientImpl.h',
    249                 'src/GeolocationServiceBridgeChromium.cpp',             
    250251                'src/gtk/WebFontInfo.cpp',
    251252                'src/gtk/WebFontInfo.h',
    … …  
    324325                'src/WebFrameImpl.cpp',
    325326                'src/WebFrameImpl.h',
     327                'src/WebGeolocationServiceBridgeImpl.cpp',
     328                'src/WebGeolocationServiceBridgeImpl.h',
    326329                'src/WebGlyphCache.cpp',
    327330                'src/WebGraphicsContext3D.cpp',

  • trunk/WebKit/chromium/public/GeolocationServiceBridgeChromium.h

    r56011 r56803  
    3232#define GeolocationServiceBridgeChromium_h
    3333
    34 namespace WebCore {
    35 class GeolocationServiceBridge;
    36 class GeolocationServiceChromium;
    37 }
     34#include "WebGeolocationService.h"
    3835
    3936namespace WebKit {
    4037
    41 class WebString;
    42 class WebURL;
    43 
    44 // Provides a WebKit API called by the embedder.
    45 class WebGeolocationServiceBridge {
    46 public:
    47     virtual void setIsAllowed(bool allowed) = 0;
    48     virtual void setLastPosition(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed, long long timestamp) = 0;
    49     virtual void setLastError(int errorCode, const WebString& message) = 0;
     38// DEPRECATED: remove this file, this is a temporary compatibility layer for
     39// renaming WebGeolocationServiceInterface to WebGeolocationService.
     40class WebGeolocationServiceInterface : public WebGeolocationService {
    5041};
    51 
    52 // Provides an embedder API called by WebKit.
    53 class WebGeolocationServiceInterface {
    54 public:
    55     virtual void requestPermissionForFrame(int bridgeId, const WebURL& url) = 0;
    56     virtual void startUpdating(int bridgeId, const WebURL& url, bool enableHighAccuracy) = 0;
    57     virtual void stopUpdating(int bridgeId) = 0;
    58     virtual void suspend(int bridgeId) = 0;
    59     virtual void resume(int bridgeId) = 0;
    60 
    61     // Attaches the GeolocationBridge to the embedder and returns its id, which
    62     // should be used on subsequent calls for the methods above.
    63     virtual int attachBridge(WebKit::WebGeolocationServiceBridge* geolocationServiceBridge) = 0;
    64 
    65     // Dettaches the GeolocationService from the embedder.
    66     virtual void dettachBridge(int bridgeId) = 0;
    67 };
    68 
    69 WebCore::GeolocationServiceBridge* createGeolocationServiceBridgeImpl(WebCore::GeolocationServiceChromium*);
    7042
    7143} // namespace WebKit

  • trunk/WebKit/chromium/public/WebGeolocationService.h

    r56802 r56803  
    2929 */
    3030
    31 #ifndef GeolocationServiceBridgeChromium_h
    32 #define GeolocationServiceBridgeChromium_h
     31#ifndef WebGeolocationService_h
     32#define WebGeolocationService_h
    3333
    34 namespace WebCore {
    35 class GeolocationServiceBridge;
    36 class GeolocationServiceChromium;
    37 }
     34#include "WebGeolocationServiceBridge.h"
    3835
    3936namespace WebKit {
    … …  
    4239class WebURL;
    4340
    44 // Provides a WebKit API called by the embedder.
    45 class WebGeolocationServiceBridge {
     41// Provides an embedder API called by WebKit.
     42class WebGeolocationService {
    4643public:
    47     virtual void setIsAllowed(bool allowed) = 0;
    48     virtual void setLastPosition(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed, long long timestamp) = 0;
    49     virtual void setLastError(int errorCode, const WebString& message) = 0;
     44    virtual void requestPermissionForFrame(int bridgeId, const WebURL& url) { }
     45    virtual void startUpdating(int bridgeId, const WebURL& url, bool enableHighAccuracy) { }
     46    virtual void stopUpdating(int bridgeId) { }
     47    virtual void suspend(int bridgeId) { }
     48    virtual void resume(int bridgeId) { }
     49
     50    // Attaches the WebGeolocationServiceBridge to the embedder and returns its
     51    // id, which should be used on subsequent calls for the methods above.
     52    virtual int attachBridge(WebGeolocationServiceBridge*) { return 0; }
     53
     54    // Detaches the WebGeolocationServiceBridge from the embedder.
     55    virtual void detachBridge(int bridgeId) { dettachBridge(bridgeId); }
     56
     57    // DEPRECATED: this is a temporary compatibility layer, remove this method.
     58    virtual void dettachBridge(int bridgeId) { }
    5059};
    51 
    52 // Provides an embedder API called by WebKit.
    53 class WebGeolocationServiceInterface {
    54 public:
    55     virtual void requestPermissionForFrame(int bridgeId, const WebURL& url) = 0;
    56     virtual void startUpdating(int bridgeId, const WebURL& url, bool enableHighAccuracy) = 0;
    57     virtual void stopUpdating(int bridgeId) = 0;
    58     virtual void suspend(int bridgeId) = 0;
    59     virtual void resume(int bridgeId) = 0;
    60 
    61     // Attaches the GeolocationBridge to the embedder and returns its id, which
    62     // should be used on subsequent calls for the methods above.
    63     virtual int attachBridge(WebKit::WebGeolocationServiceBridge* geolocationServiceBridge) = 0;
    64 
    65     // Dettaches the GeolocationService from the embedder.
    66     virtual void dettachBridge(int bridgeId) = 0;
    67 };
    68 
    69 WebCore::GeolocationServiceBridge* createGeolocationServiceBridgeImpl(WebCore::GeolocationServiceChromium*);
    7060
    7161} // namespace WebKit
    7262
    73 #endif // GeolocationServiceBridgeChromium_h
     63#endif // WebGeolocationService_h

  • trunk/WebKit/chromium/public/WebGeolocationServiceBridge.h

    r56802 r56803  
    2929 */
    3030
    31 #ifndef GeolocationServiceBridgeChromium_h
    32 #define GeolocationServiceBridgeChromium_h
     31#ifndef WebGeolocationServiceBridge_h
     32#define WebGeolocationServiceBridge_h
    3333
    3434namespace WebCore {
    … …  
    5050};
    5151
    52 // Provides an embedder API called by WebKit.
    53 class WebGeolocationServiceInterface {
    54 public:
    55     virtual void requestPermissionForFrame(int bridgeId, const WebURL& url) = 0;
    56     virtual void startUpdating(int bridgeId, const WebURL& url, bool enableHighAccuracy) = 0;
    57     virtual void stopUpdating(int bridgeId) = 0;
    58     virtual void suspend(int bridgeId) = 0;
    59     virtual void resume(int bridgeId) = 0;
    60 
    61     // Attaches the GeolocationBridge to the embedder and returns its id, which
    62     // should be used on subsequent calls for the methods above.
    63     virtual int attachBridge(WebKit::WebGeolocationServiceBridge* geolocationServiceBridge) = 0;
    64 
    65     // Dettaches the GeolocationService from the embedder.
    66     virtual void dettachBridge(int bridgeId) = 0;
    67 };
    68 
    69 WebCore::GeolocationServiceBridge* createGeolocationServiceBridgeImpl(WebCore::GeolocationServiceChromium*);
    70 
    7152} // namespace WebKit
    7253
    73 #endif // GeolocationServiceBridgeChromium_h
     54#endif // WebGeolocationServiceBridge_h

  • trunk/WebKit/chromium/public/WebViewClient.h

    r56449 r56803  
    3232#define WebViewClient_h
    3333
     34// DEPRECATED: this is a temporary compatibility layer, remove it.
     35#include "GeolocationServiceBridgeChromium.h"
    3436#include "WebDragOperation.h"
    3537#include "WebEditingAction.h"
    3638#include "WebFileChooserCompletion.h"
    3739#include "WebFileChooserParams.h"
     40#include "WebGeolocationServiceBridge.h"
    3841#include "WebString.h"
    3942#include "WebTextAffinity.h"
    … …  
    4750class WebFileChooserCompletion;
    4851class WebFrame;
    49 class WebGeolocationServiceInterface;
    5052class WebNode;
    5153class WebNotificationPresenter;
    … …  
    292294
    293295    // Access the embedder API for geolocation services.
     296    virtual WebKit::WebGeolocationService* geolocationService() { return getGeolocationService(); }
     297
     298    // DEPRECATED: this is a temporary compatibility layer, remove it.
    294299    virtual WebKit::WebGeolocationServiceInterface* getGeolocationService() { return 0; }
    295300

  • trunk/WebKit/chromium/src/ChromeClientImpl.cpp

    r56449 r56803  
    4646#include "Geolocation.h"
    4747#include "GeolocationService.h"
    48 #include "GeolocationServiceBridgeChromium.h"
     48#include "WebGeolocationService.h"
    4949#include "GeolocationServiceChromium.h"
    5050#include "GraphicsLayer.h"
    … …  
    705705{
    706706    GeolocationServiceChromium* geolocationService = reinterpret_cast<GeolocationServiceChromium*>(geolocation->getGeolocationService());
    707     m_webView->client()->getGeolocationService()->requestPermissionForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
     707    m_webView->client()->geolocationService()->requestPermissionForFrame(geolocationService->geolocationServiceBridge()->getBridgeId(), frame->document()->url());
    708708}
    709709

  • trunk/WebKit/chromium/src/ChromiumBridge.cpp

    r56201 r56803  
    7676#include "Cookie.h"
    7777#include "FrameView.h"
    78 #include "GeolocationServiceBridgeChromium.h"
    7978#include "GraphicsContext.h"
    8079#include "IndexedDatabaseProxy.h"
    … …  
    8483#include "PluginData.h"
    8584#include "SharedBuffer.h"
     85#include "WebGeolocationServiceBridgeImpl.h"
    8686#include "Worker.h"
    8787#include "WorkerContextProxy.h"

  • trunk/WebKit/chromium/src/WebGeolocationServiceBridgeImpl.cpp

    r56802 r56803  
    3030
    3131#include "config.h"
    32 
    33 #include "GeolocationServiceBridgeChromium.h"
     32#include "WebGeolocationServiceBridgeImpl.h"
    3433
    3534#include "Chrome.h"
    … …  
    4443#include "WebFrame.h"
    4544#include "WebFrameImpl.h"
     45#include "WebGeolocationService.h"
     46#include "WebGeolocationServiceBridge.h"
    4647#include "WebViewClient.h"
    4748#include "WebViewImpl.h"
    … …  
    6263namespace WebKit {
    6364
    64 class GeolocationServiceBridgeImpl : public GeolocationServiceBridge, public WebGeolocationServiceBridge {
     65class WebGeolocationServiceBridgeImpl : public GeolocationServiceBridge, public WebGeolocationServiceBridge {
    6566public:
    66     explicit GeolocationServiceBridgeImpl(GeolocationServiceChromium*);
    67     virtual ~GeolocationServiceBridgeImpl();
     67    explicit WebGeolocationServiceBridgeImpl(GeolocationServiceChromium*);
     68    virtual ~WebGeolocationServiceBridgeImpl();
    6869
    6970    // GeolocationServiceBridge
    … …  
    8990GeolocationServiceBridge* createGeolocationServiceBridgeImpl(GeolocationServiceChromium* geolocationServiceChromium)
    9091{
    91     return new GeolocationServiceBridgeImpl(geolocationServiceChromium);
     92    return new WebGeolocationServiceBridgeImpl(geolocationServiceChromium);
    9293}
    9394
    94 GeolocationServiceBridgeImpl::GeolocationServiceBridgeImpl(GeolocationServiceChromium* geolocationServiceChromium)
     95WebGeolocationServiceBridgeImpl::WebGeolocationServiceBridgeImpl(GeolocationServiceChromium* geolocationServiceChromium)
    9596    : m_GeolocationServiceChromium(geolocationServiceChromium)
    9697{
    … …  
    9899    // directly, and we need to be attached so that the embedder can call
    99100    // our setIsAllowed().
    100     m_bridgeId = getWebViewClient()->getGeolocationService()->attachBridge(this);
     101    m_bridgeId = getWebViewClient()->geolocationService()->attachBridge(this);
    101102    ASSERT(m_bridgeId);
    102103}
    103104
    104 GeolocationServiceBridgeImpl::~GeolocationServiceBridgeImpl()
     105WebGeolocationServiceBridgeImpl::~WebGeolocationServiceBridgeImpl()
    105106{
    106107    WebKit::WebViewClient* webViewClient = getWebViewClient();
    107108    // Geolocation has an OwnPtr to us, and it's destroyed after the frame has
    108109    // been potentially disconnected. In this case, it calls stopUpdating()
    109     // has been called and we have already dettached ourselves.
    110     if (!webViewClient) {
     110    // has been called and we have already detached ourselves.
     111    if (!webViewClient)
    111112        ASSERT(!m_bridgeId);
    112     } else if (m_bridgeId)
    113         webViewClient->getGeolocationService()->dettachBridge(m_bridgeId);
     113    else if (m_bridgeId)
     114        webViewClient->geolocationService()->detachBridge(m_bridgeId);
    114115}
    115116
    116 bool GeolocationServiceBridgeImpl::startUpdating(PositionOptions* positionOptions)
     117bool WebGeolocationServiceBridgeImpl::startUpdating(PositionOptions* positionOptions)
    117118{
    118119    if (!m_bridgeId)
    119         m_bridgeId = getWebViewClient()->getGeolocationService()->attachBridge(this);
    120     getWebViewClient()->getGeolocationService()->startUpdating(m_bridgeId, m_GeolocationServiceChromium->frame()->document()->url(), positionOptions->enableHighAccuracy());
     120        m_bridgeId = getWebViewClient()->geolocationService()->attachBridge(this);
     121    getWebViewClient()->geolocationService()->startUpdating(m_bridgeId, m_GeolocationServiceChromium->frame()->document()->url(), positionOptions->enableHighAccuracy());
    121122    return true;
    122123}
    123124
    124 void GeolocationServiceBridgeImpl::stopUpdating()
     125void WebGeolocationServiceBridgeImpl::stopUpdating()
    125126{
    126127    if (m_bridgeId) {
    127         WebGeolocationServiceInterface* geolocationService = getWebViewClient()->getGeolocationService();
     128        WebGeolocationService* geolocationService = getWebViewClient()->geolocationService();
    128129        geolocationService->stopUpdating(m_bridgeId);
    129         geolocationService->dettachBridge(m_bridgeId);
     130        geolocationService->detachBridge(m_bridgeId);
    130131        m_bridgeId = 0;
    131132    }
    132133}
    133134
    134 void GeolocationServiceBridgeImpl::suspend()
     135void WebGeolocationServiceBridgeImpl::suspend()
    135136{
    136     getWebViewClient()->getGeolocationService()->suspend(m_bridgeId);
     137    getWebViewClient()->geolocationService()->suspend(m_bridgeId);
    137138}
    138139
    139 void GeolocationServiceBridgeImpl::resume()
     140void WebGeolocationServiceBridgeImpl::resume()
    140141{
    141     getWebViewClient()->getGeolocationService()->resume(m_bridgeId);
     142    getWebViewClient()->geolocationService()->resume(m_bridgeId);
    142143}
    143144
    144 int GeolocationServiceBridgeImpl::getBridgeId() const
     145int WebGeolocationServiceBridgeImpl::getBridgeId() const
    145146{
    146147    return m_bridgeId;
    147148}
    148149
    149 void GeolocationServiceBridgeImpl::setIsAllowed(bool allowed)
     150void WebGeolocationServiceBridgeImpl::setIsAllowed(bool allowed)
    150151{
    151152    m_GeolocationServiceChromium->setIsAllowed(allowed);
    152153}
    153154
    154 void GeolocationServiceBridgeImpl::setLastPosition(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed, long long timestamp)
     155void WebGeolocationServiceBridgeImpl::setLastPosition(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed, long long timestamp)
    155156{
    156     m_GeolocationServiceChromium->setLastPosition(latitude, longitude, providesAltitude, altitude, accuracy, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed, timestamp);
     157    RefPtr<Geoposition> geoposition = Geoposition::create(Coordinates::create(latitude, longitude, providesAltitude, altitude, accuracy, providesAltitudeAccuracy, altitudeAccuracy, providesHeading, heading, providesSpeed, speed), timestamp);
     158    m_GeolocationServiceChromium->setLastPosition(geoposition);
    157159}
    158160
    159 void GeolocationServiceBridgeImpl::setLastError(int errorCode, const WebString& message)
     161void WebGeolocationServiceBridgeImpl::setLastError(int errorCode, const WebString& message)
    160162{
    161163    m_GeolocationServiceChromium->setLastError(errorCode, message);
    162164}
    163165
    164 WebViewClient* GeolocationServiceBridgeImpl::getWebViewClient()
     166WebViewClient* WebGeolocationServiceBridgeImpl::getWebViewClient()
    165167{
    166168    Frame* frame = m_GeolocationServiceChromium->frame();
Note: See TracChangeset for help on using the changeset viewer.