Changeset 55444 in webkit
- Timestamp:
- Mar 2, 2010 5:27:25 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r55418 r55444 1 2010-03-02 Arno Renevier <arno@renevier.net> 2 3 Reviewed by Gustavo Noronha Silva. 4 5 [Gtk] implements ChromeClient::requestGeolocationPermissionForFrame 6 https://bugs.webkit.org/show_bug.cgi?id=35210 7 8 * GNUmakefile.am: 9 1 10 2010-03-02 Dmitry Titov <dimich@chromium.org> 2 11 -
trunk/GNUmakefile.am
r55173 r55444 328 328 $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \ 329 329 $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \ 330 $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \ 330 331 $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \ 331 332 $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \ … … 376 377 WebKit/gtk/webkit/webkitwebnavigationaction.cpp \ 377 378 WebKit/gtk/webkit/webkitwebpolicydecision.cpp \ 379 WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \ 378 380 WebKit/gtk/webkit/webkitwebresource.cpp \ 379 381 WebKit/gtk/webkit/webkitwebdatabase.cpp \ -
trunk/LayoutTests/ChangeLog
r55436 r55444 1 2010-03-02 Arno Renevier <arno@renevier.net> 2 3 Reviewed by Gustavo Noronha Silva. 4 5 [Gtk] implements ChromeClient::requestGeolocationPermissionForFrame 6 https://bugs.webkit.org/show_bug.cgi?id=35210 7 8 * platform/gtk/Skipped: 9 1 10 2010-03-02 Andy Estes <aestes@apple.com> 2 11 -
trunk/LayoutTests/platform/gtk/Skipped
r55405 r55444 1286 1286 fast/dom/Geolocation/error.html 1287 1287 fast/dom/Geolocation/permission-denied-already-clear-watch.html 1288 fast/dom/Geolocation/permission-denied-already-error.html1289 fast/dom/Geolocation/permission-denied-already-success.html1290 fast/dom/Geolocation/permission-denied-stops-watches.html1291 fast/dom/Geolocation/permission-denied.html1292 1288 fast/dom/Geolocation/position-string.html 1293 1289 fast/dom/Geolocation/reentrant-error.html … … 1295 1291 fast/dom/Geolocation/success.html 1296 1292 fast/dom/Geolocation/timeout-clear-watch.html 1297 fast/dom/Geolocation/timeout-zero.html1298 1293 fast/dom/Geolocation/timeout.html 1299 1294 fast/dom/Geolocation/watch.html -
trunk/WebKit/gtk/ChangeLog
r55389 r55444 1 2010-03-02 Arno Renevier <arno@renevier.net> 2 3 Reviewed by Gustavo Noronha Silva. 4 5 [Gtk] implements ChromeClient::requestGeolocationPermissionForFrame 6 https://bugs.webkit.org/show_bug.cgi?id=35210 7 8 * WebCoreSupport/ChromeClientGtk.cpp: 9 * WebCoreSupport/ChromeClientGtk.h: 10 * docs/webkitgtk-sections.txt: 11 * webkit/webkit.h: 12 * webkit/webkitdefines.h: 13 * webkit/webkitgeolocationpolicydecision.cpp: Added. 14 (webkit_geolocation_policy_decision_class_init): 15 (webkit_geolocation_policy_decision_init): 16 (webkit_geolocation_policy_decision_new): 17 (webkit_geolocation_policy_allow): 18 (webkit_geolocation_policy_deny): 19 * webkit/webkitgeolocationpolicydecision.h: Added. 20 * webkit/webkitprivate.h: 21 * webkit/webkitwebview.cpp: 22 (DNDContentsRequest::webkit_web_view_class_init): 23 * webkitmarshal.list: 24 1 25 2010-03-01 José Millán Soto <jmillan@igalia.com> 2 26 -
trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
r55378 r55444 34 34 #include "HitTestResult.h" 35 35 #include "KURL.h" 36 #include "webkitgeolocationpolicydecision.h" 36 37 #include "webkitwebview.h" 37 38 #include "webkitnetworkrequest.h" … … 576 577 } 577 578 578 void ChromeClient::requestGeolocationPermissionForFrame(Frame*, Geolocation*) 579 { 580 // See the comment in WebCore/page/ChromeClient.h 581 notImplemented(); 582 } 583 584 } 579 void ChromeClient::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation) 580 { 581 WebKitWebFrame* webFrame = kit(frame); 582 WebKitWebView* webView = getViewFromFrame(webFrame); 583 584 WebKitGeolocationPolicyDecision* policyDecision = webkit_geolocation_policy_decision_new(webFrame, geolocation); 585 586 gboolean isHandled = FALSE; 587 g_signal_emit_by_name(webView, "geolocation-policy-decision-requested", webFrame, policyDecision, &isHandled); 588 if (!isHandled) 589 webkit_geolocation_policy_deny(policyDecision); 590 } 591 592 void ChromeClient::cancelGeolocationPermissionRequestForFrame(WebCore::Frame* frame) 593 { 594 WebKitWebFrame* webFrame = kit(frame); 595 WebKitWebView* webView = getViewFromFrame(webFrame); 596 g_signal_emit_by_name(webView, "geolocation-policy-decision-cancelled", webFrame); 597 } 598 599 } -
trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
r55136 r55444 118 118 virtual void scrollRectIntoView(const WebCore::IntRect&, const WebCore::ScrollView*) const {} 119 119 virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*); 120 virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*) { }120 virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*); 121 121 122 122 private: -
trunk/WebKit/gtk/docs/webkitgtk-docs.sgml
r54260 r55444 19 19 <xi:include href="xml/webkitwebnavigationaction.xml"/> 20 20 <xi:include href="xml/webkitwebpolicydecision.xml"/> 21 <xi:include href="xml/webkitgeolocationpolicydecision.xml"/> 21 22 <xi:include href="xml/webkitnetworkrequest.xml"/> 22 23 <xi:include href="xml/webkitnetworkresponse.xml"/> -
trunk/WebKit/gtk/docs/webkitgtk-sections.txt
r54959 r55444 349 349 WebKitWebPolicyDecisionClass 350 350 WebKitWebPolicyDecisionPrivate 351 </SECTION> 352 353 <SECTION> 354 <FILE>webkitgeolocationpolicydecision</FILE> 355 <TITLE>WebKitGeolocationPolicyDecision</TITLE> 356 WebKitGeolocationPolicyDecision 357 webkit_geolocation_policy_allow 358 webkit_geolocation_policy_deny 359 <SUBSECTION Standard> 360 WEBKIT_IS_GEOLOCATION_POLICY_DECISION 361 WEBKIT_IS_GEOLOCATION_POLICY_DECISION_CLASS 362 WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION 363 WEBKIT_GEOLOCATION_POLICY_DECISION 364 WEBKIT_GEOLOCATION_POLICY_DECISION_CLASS 365 WEBKIT_GEOLOCATION_POLICY_DECISION_GET_CLASS 366 <SUBSECTION Private> 367 WebKitGeolocationPolicyDecision 368 WebKitGeolocationPolicyDecisionClass 369 WebKitGeolocationPolicyDecisionPrivate 351 370 </SECTION> 352 371 -
trunk/WebKit/gtk/webkit/webkit.h
r48505 r55444 25 25 #include <webkit/webkitdefines.h> 26 26 #include <webkit/webkitdownload.h> 27 #include <webkit/webkitgeolocationpolicydecision.h> 27 28 #include <webkit/webkithittestresult.h> 28 29 #include <webkit/webkitnetworkrequest.h> -
trunk/WebKit/gtk/webkit/webkitdefines.h
r49168 r55444 90 90 typedef struct _WebKitHitTestResultClass WebKitHitTestResultClass; 91 91 92 typedef struct _WebKitGeolocationPolicyDecision WebKitGeolocationPolicyDecision; 93 typedef struct _WebKitGeolocationPolicyDecisionClass WebKitGeolocationPolicyDecisionClass; 94 92 95 G_END_DECLS 93 96 -
trunk/WebKit/gtk/webkit/webkitprivate.h
r55222 r55444 50 50 #include <enchant.h> 51 51 #include "GOwnPtr.h" 52 #include "Geolocation.h" 52 53 #include "HistoryItem.h" 53 54 #include "Settings.h" … … 272 273 webkit_network_response_new_with_core_response(const WebCore::ResourceResponse& resourceResponse); 273 274 275 WebKitGeolocationPolicyDecision* 276 webkit_geolocation_policy_decision_new(WebKitWebFrame*, WebCore::Geolocation*); 277 274 278 // FIXME: move this to webkitnetworkrequest.h once the API is agreed upon. 275 279 WEBKIT_API SoupMessage* -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r55389 r55444 32 32 #include "webkitdownload.h" 33 33 #include "webkitenumtypes.h" 34 #include "webkitgeolocationpolicydecision.h" 34 35 #include "webkitmarshal.h" 35 36 #include "webkitnetworkrequest.h" … … 160 161 RESOURCE_REQUEST_STARTING, 161 162 DOCUMENT_LOAD_FINISHED, 163 GEOLOCATION_POLICY_DECISION_REQUESTED, 164 GEOLOCATION_POLICY_DECISION_CANCELLED, 162 165 LAST_SIGNAL 163 166 }; … … 2212 2215 WEBKIT_TYPE_NETWORK_REQUEST, 2213 2216 WEBKIT_TYPE_NETWORK_RESPONSE); 2217 2218 /** 2219 * WebKitWebView::geolocation-policy-decision-requested: 2220 * @web_view: the object on which the signal is emitted 2221 * @frame: the frame that requests permission 2222 * @policy_decision: a WebKitGeolocationPolicyDecision 2223 * 2224 * When a @frame wants to get its geolocation permission. 2225 * The receiver must reply with a boolean wether it handled or not the 2226 * request. If the request is not handled, default behaviour is to deny 2227 * geolocation. 2228 * 2229 * Since: 1.1.23 2230 */ 2231 webkit_web_view_signals[GEOLOCATION_POLICY_DECISION_REQUESTED] = g_signal_new("geolocation-policy-decision-requested", 2232 G_TYPE_FROM_CLASS(webViewClass), 2233 (GSignalFlags)(G_SIGNAL_RUN_LAST), 2234 0, 2235 NULL, NULL, 2236 webkit_marshal_BOOLEAN__OBJECT_OBJECT, 2237 G_TYPE_BOOLEAN, 2, 2238 WEBKIT_TYPE_WEB_FRAME, 2239 WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION); 2240 2241 /** 2242 * WebKitWebView::geolocation-policy-decision-cancelled: 2243 * @web_view: the object on which the signal is emitted 2244 * @frame: the frame that cancels geolocation request. 2245 * 2246 * When a @frame wants to cancel geolocation permission it had requested 2247 * before. 2248 * 2249 * Since: 1.1.23 2250 */ 2251 webkit_web_view_signals[GEOLOCATION_POLICY_DECISION_REQUESTED] = g_signal_new("geolocation-policy-decision-cancelled", 2252 G_TYPE_FROM_CLASS(webViewClass), 2253 (GSignalFlags)(G_SIGNAL_RUN_LAST), 2254 0, 2255 NULL, NULL, 2256 g_cclosure_marshal_VOID__OBJECT, 2257 G_TYPE_NONE, 1, 2258 WEBKIT_TYPE_WEB_FRAME); 2214 2259 2215 2260 /* -
trunk/WebKit/gtk/webkitmarshal.list
r48118 r55444 2 2 BOOLEAN:INT,INT,STRING 3 3 BOOLEAN:OBJECT 4 BOOLEAN:OBJECT,OBJECT 4 5 BOOLEAN:OBJECT,OBJECT,OBJECT,OBJECT 5 6 BOOLEAN:OBJECT,OBJECT,STRING,OBJECT -
trunk/WebKitTools/ChangeLog
r55439 r55444 1 2010-03-02 Arno Renevier <arno@renevier.net> 2 3 Reviewed by Gustavo Noronha Silva. 4 5 [Gtk] implements ChromeClient::requestGeolocationPermissionForFrame 6 https://bugs.webkit.org/show_bug.cgi?id=35210 7 8 * DumpRenderTree/gtk/DumpRenderTree.cpp: 9 (geolocationPolicyDecisionRequested): 10 (createWebView): 11 1 12 2010-03-02 Dirk Pranke <dpranke@chromium.org> 2 13 -
trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
r55316 r55444 737 737 } 738 738 739 static bool 740 geolocationPolicyDecisionRequested(WebKitWebView*, WebKitWebFrame*, WebKitGeolocationPolicyDecision* decision) 741 { 742 if (!gLayoutTestController->isGeolocationPermissionSet()) 743 return FALSE; 744 if (gLayoutTestController->geolocationPermission()) 745 webkit_geolocation_policy_allow(decision); 746 else 747 webkit_geolocation_policy_deny(decision); 748 749 return TRUE; 750 } 751 739 752 740 753 static WebKitWebView* webViewCreate(WebKitWebView*, WebKitWebFrame*); … … 788 801 "signal::database-quota-exceeded", databaseQuotaExceeded, 0, 789 802 "signal::document-load-finished", webViewDocumentLoadFinished, 0, 803 "signal::geolocation-policy-decision-requested", geolocationPolicyDecisionRequested, 0, 790 804 NULL); 791 805
Note: See TracChangeset
for help on using the changeset viewer.