Merge 66837 - 2010-09-06 Jonathan Dixon <joth@chromium.org>...

WebKit/chromium/src/WebGeolocationServiceBridgeImpl.cpp

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 61 matching lines @@
     virtual void stopUpdating();
     virtual void suspend();
     virtual void resume();
     virtual int getBridgeId() const;
     virtual void attachBridgeIfNeeded();
 
     // WebGeolocationServiceBridge
     virtual void setIsAllowed(bool allowed);
     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);
     virtual void setLastError(int errorCode, const WebString& message);
+    virtual void onWebGeolocationServiceDestroyed();
 
 private:
     WebViewClient* getWebViewClient();
 
     // GeolocationServiceChromium owns us, we only have a pointer back to it.
     GeolocationServiceChromium* m_GeolocationServiceChromium;
     int m_bridgeId;
 };
 
 GeolocationServiceBridge* createGeolocationServiceBridgeImpl(GeolocationServiceChromium* geolocationServiceChromium)
@@ skipping 77 matching lines @@
 WebViewClient* WebGeolocationServiceBridgeImpl::getWebViewClient()
 {
     Frame* frame = m_GeolocationServiceChromium->frame();
     if (!frame || !frame->page())
         return 0;
     WebKit::ChromeClientImpl* chromeClientImpl = static_cast<WebKit::ChromeClientImpl*>(frame->page()->chrome()->client());
     WebKit::WebViewClient* webViewClient = chromeClientImpl->webView()->client();
     return webViewClient;
 }
 
+void WebGeolocationServiceBridgeImpl::onWebGeolocationServiceDestroyed()
+{
+}
+
 } // namespace WebKit
 
 #endif // ENABLE(GEOLOCATION)