[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
steveblock at google.com
steveblock at google.com
Thu Apr 8 01:56:36 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 641c195c4efc1abed7c10298abb838f18df73d4d
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 23 10:35:24 2010 +0000
Adds Client::cancelGeolocationPermissionRequestForFrame and ChromeClient::cancelGeolocationPermissionRequestForFrame
https://bugs.webkit.org/show_bug.cgi?id=34962
These methods are required so that a Geolocation object can cancel an
asynchronous permission request. This allows the chrome client to cancel
any UI it is showing for the permission request.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55136 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f820a60..ee08b35 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2010-02-23 Steve Block <steveblock at google.com>
+
+ Reviewed by Darin Adler.
+
+ Adds Client::cancelGeolocationPermissionRequestForFrame and ChromeClient::cancelGeolocationPermissionRequestForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=34962
+
+ These methods are required so that a Geolocation object can cancel an
+ asynchronous permission request. This allows the chrome client to cancel
+ any UI it is showing for the permission request.
+
+ No new tests, as this is for the purposes of browser UI only.
+
+ * loader/EmptyClients.h: Modified
+ (WebCore::EmptyChromeClient::cancelGeolocationPermissionRequestForFrame): Added
+ * page/Chrome.cpp: Modified.
+ (WebCore::Chrome::cancelGeolocationPermissionRequestForFrame): Added
+ * page/Chrome.h: Modified.
+ * page/ChromeClient.h: Modified.
+ (WebCore::ChromeClient::cancelGeolocationPermissionRequestForFrame): Added
+ * page/Geolocation.cpp: Modified.
+ (WebCore::Geolocation::disconnectFrame): Modified. Call cancelGeolocationPermissionRequestForFrame
+
2010-02-23 Tony Chang <tony at chromium.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
index ead0124..2f9a267 100644
--- a/WebCore/loader/EmptyClients.h
+++ b/WebCore/loader/EmptyClients.h
@@ -160,6 +160,7 @@ public:
virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) {}
+ virtual void cancelGeolocationPermissionRequestForFrame(Frame*) {}
#if USE(ACCELERATED_COMPOSITING)
virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*) {};
diff --git a/WebCore/page/Chrome.cpp b/WebCore/page/Chrome.cpp
index 974a39f..6624d78 100644
--- a/WebCore/page/Chrome.cpp
+++ b/WebCore/page/Chrome.cpp
@@ -410,6 +410,11 @@ void Chrome::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geo
m_client->requestGeolocationPermissionForFrame(frame, geolocation);
}
+void Chrome::cancelGeolocationPermissionRequestForFrame(Frame* frame)
+{
+ m_client->cancelGeolocationPermissionRequestForFrame(frame);
+}
+
void Chrome::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser)
{
m_client->runOpenPanel(frame, fileChooser);
diff --git a/WebCore/page/Chrome.h b/WebCore/page/Chrome.h
index b37e7eb..753adea 100644
--- a/WebCore/page/Chrome.h
+++ b/WebCore/page/Chrome.h
@@ -129,6 +129,7 @@ namespace WebCore {
void print(Frame*);
void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
+ void cancelGeolocationPermissionRequestForFrame(Frame*);
void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index 1421631..b05d85b 100644
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -181,8 +181,9 @@ namespace WebCore {
virtual bool paintCustomScrollCorner(GraphicsContext*, const FloatRect&);
// This can be either a synchronous or asynchronous call. The ChromeClient can display UI asking the user for permission
- // to use Geolococation. The ChromeClient must call Geolocation::setShouldClearCache() appropriately.
+ // to use Geolocation.
virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) = 0;
+ virtual void cancelGeolocationPermissionRequestForFrame(Frame*) = 0;
virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>) = 0;
// Asynchronous request to load an icon for specified filenames.
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index e6af542..dbf32e8 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -192,8 +192,12 @@ Geolocation::~Geolocation()
void Geolocation::disconnectFrame()
{
stopUpdating();
- if (m_frame && m_frame->document())
- m_frame->document()->setUsingGeolocation(false);
+ if (m_frame) {
+ if (m_frame->document())
+ m_frame->document()->setUsingGeolocation(false);
+ if (m_frame->page() && m_allowGeolocation == InProgress)
+ m_frame->page()->chrome()->cancelGeolocationPermissionRequestForFrame(m_frame);
+ }
m_frame = 0;
}
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 12aecc2..1d86d98 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-23 Steve Block <steveblock at google.com>
+
+ Reviewed by Darin Adler.
+
+ Adds ChromeClient::cancelGeolocationPermissionRequestForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=34962
+
+ This method is required so that a Geolocation object can cancel an
+ asynchronous permission request. This allows the chrome client to cancel
+ any UI it is showing for the permission request.
+
+ * src/ChromeClientImpl.h:
+ (WebKit::ChromeClientImpl::cancelGeolocationPermissionRequestForFrame):
+
2009-02-22 Adam Langley <agl at google.com>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/ChromeClientImpl.h b/WebKit/chromium/src/ChromeClientImpl.h
index 3a4035b..5bf9382 100644
--- a/WebKit/chromium/src/ChromeClientImpl.h
+++ b/WebKit/chromium/src/ChromeClientImpl.h
@@ -122,6 +122,7 @@ public:
virtual WebCore::NotificationPresenter* notificationPresenter() const;
#endif
virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
+ virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
virtual void iconForFiles(const Vector<WebCore::String>&, PassRefPtr<WebCore::FileChooser>);
virtual bool setCursor(WebCore::PlatformCursorHandle) { return false; }
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 9732349..c608d96 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-23 Steve Block <steveblock at google.com>
+
+ Reviewed by Darin Adler.
+
+ Adds ChromeClient::cancelGeolocationPermissionRequestForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=34962
+
+ This method is required so that a Geolocation object can cancel an
+ asynchronous permission request. This allows the chrome client to cancel
+ any UI it is showing for the permission request.
+
+ * WebCoreSupport/ChromeClientGtk.h:
+ (WebKit::ChromeClient::cancelGeolocationPermissionRequestForFrame):
+
2010-02-23 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
index 7e407d3..62d48fa 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
@@ -117,6 +117,7 @@ namespace WebKit {
virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const {}
virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
+ virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
private:
WebKitWebView* m_webView;
diff --git a/WebKit/haiku/ChangeLog b/WebKit/haiku/ChangeLog
index 93833fc..4c37bae 100644
--- a/WebKit/haiku/ChangeLog
+++ b/WebKit/haiku/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-23 Steve Block <steveblock at google.com>
+
+ Reviewed by Darin Adler.
+
+ Adds ChromeClient::cancelGeolocationPermissionRequestForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=34962
+
+ This method is required so that a Geolocation object can cancel an
+ asynchronous permission request. This allows the chrome client to cancel
+ any UI it is showing for the permission request.
+
+ * WebCoreSupport/ChromeClientHaiku.h:
+ (WebCore::ChromeClientHaiku::cancelGeolocationPermissionRequestForFrame):
+
2010-02-17 Dmitry Titov <dimich at chromium.org>
Reviewed by David Levin, Darin Fisher, Simon Hausmann.
diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
index 3b0841b..3d77459 100644
--- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
+++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
@@ -130,8 +130,9 @@ namespace WebCore {
#endif
// This is an asynchronous call. The ChromeClient can display UI asking the user for permission
- // to use Geolococation. The ChromeClient must call Geolocation::setShouldClearCache() appropriately.
+ // to use Geolococation.
void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
+ void cancelGeolocationPermissionRequestForFrame(Frame*) { }
void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 2640e5c..56ebdc6 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-23 Steve Block <steveblock at google.com>
+
+ Reviewed by Darin Adler.
+
+ Adds ChromeClient::cancelGeolocationPermissionRequestForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=34962
+
+ This method is required so that a Geolocation object can cancel an
+ asynchronous permission request. This allows the chrome client to cancel
+ any UI it is showing for the permission request.
+
+ * WebCoreSupport/WebChromeClient.h:
+ (WebChromeClient::cancelGeolocationPermissionRequestForFrame):
+
2010-02-22 Alexey Proskuryakov <ap at apple.com>
Rubber-stamped by Geoff Garen.
diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.h b/WebKit/mac/WebCoreSupport/WebChromeClient.h
index 25bacdf..c8da53b 100644
--- a/WebKit/mac/WebCoreSupport/WebChromeClient.h
+++ b/WebKit/mac/WebCoreSupport/WebChromeClient.h
@@ -160,6 +160,7 @@ public:
#endif
virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
+ virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
private:
WebView *m_webView;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 693ea3b..2d1a483 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-23 Steve Block <steveblock at google.com>
+
+ Reviewed by Darin Adler.
+
+ Adds ChromeClient::cancelGeolocationPermissionRequestForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=34962
+
+ This method is required so that a Geolocation object can cancel an
+ asynchronous permission request. This allows the chrome client to cancel
+ any UI it is showing for the permission request.
+
+ * WebCoreSupport/ChromeClientQt.h:
+ (WebCore::ChromeClientQt::cancelGeolocationPermissionRequestForFrame):
+
2010-02-22 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Unreviewed Symbian build fix.
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
index 3d5cbe9..da3da59 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -149,6 +149,7 @@ namespace WebCore {
virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
+ virtual void cancelGeolocationPermissionRequestForFrame(Frame*) { }
QtAbstractWebPopup* createSelectPopup();
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 1e69178..7a13504 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-23 Steve Block <steveblock at google.com>
+
+ Reviewed by Darin Adler.
+
+ Adds ChromeClient::cancelGeolocationPermissionRequestForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=34962
+
+ This method is required so that a Geolocation object can cancel an
+ asynchronous permission request. This allows the chrome client to cancel
+ any UI it is showing for the permission request.
+
+ * WebCoreSupport/WebChromeClient.h:
+ (WebChromeClient::cancelGeolocationPermissionRequestForFrame):
+
2010-02-22 Steve Falkenburg <sfalken at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit/win/WebCoreSupport/WebChromeClient.h b/WebKit/win/WebCoreSupport/WebChromeClient.h
index 0958cf7..f713ac7 100644
--- a/WebKit/win/WebCoreSupport/WebChromeClient.h
+++ b/WebKit/win/WebCoreSupport/WebChromeClient.h
@@ -147,6 +147,7 @@ public:
virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const {}
virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
+ virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }
#if ENABLE(VIDEO)
virtual bool supportsFullscreenForNode(const WebCore::Node*);
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 7d6d9dd..ad8df12 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-23 Steve Block <steveblock at google.com>
+
+ Reviewed by Darin Adler.
+
+ Adds ChromeClient::cancelGeolocationPermissionRequestForFrame
+ https://bugs.webkit.org/show_bug.cgi?id=34962
+
+ This method is required so that a Geolocation object can cancel an
+ asynchronous permission request. This allows the chrome client to cancel
+ any UI it is showing for the permission request.
+
+ * WebKitSupport/ChromeClientWx.h:
+ (WebCore::ChromeClientWx::cancelGeolocationPermissionRequestForFrame):
+
2010-02-17 Dmitry Titov <dimich at chromium.org>
Reviewed by David Levin, Darin Fisher, Simon Hausmann.
diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.h b/WebKit/wx/WebKitSupport/ChromeClientWx.h
index 71ae48d..3bf9202 100644
--- a/WebKit/wx/WebKitSupport/ChromeClientWx.h
+++ b/WebKit/wx/WebKitSupport/ChromeClientWx.h
@@ -136,6 +136,7 @@ public:
virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {}
virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
+ virtual void cancelGeolocationPermissionRequestForFrame(Frame*) { }
private:
wxWebView* m_webView;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list