WebKit merge 41660:41709 (WebKit side)....

third_party/WebKit/WebCore/page/Chrome.cpp

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 10 matching lines @@
 #include "config.h"
 #include "Chrome.h"
 
 #include "ChromeClient.h"
 #include "DNS.h"
 #include "Document.h"
 #include "FileList.h"
 #include "FloatRect.h"
 #include "Frame.h"
 #include "FrameTree.h"
+#include "Geolocation.h"
 #include "HTMLFormElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 #include "HitTestResult.h"
 #include "InspectorController.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "ResourceHandle.h"
 #include "ScriptController.h"
 #include "SecurityOrigin.h"
@@ skipping 339 matching lines @@
 void Chrome::disableSuddenTermination()
 {
     m_client->disableSuddenTermination();
 }
 
 void Chrome::enableSuddenTermination()
 {
     m_client->enableSuddenTermination();
 }
 
-bool Chrome::shouldAllowGeolocationForFrame(Frame* frame)
+void Chrome::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation)
 {
     // Defer loads in case the client method runs a new event loop that would 
     // otherwise cause the load to continue while we're in the middle of executing JavaScript.
     PageGroupLoadDeferrer deferrer(m_page, true);
 
     ASSERT(frame);
-    return m_client->shouldAllowGeolocationForFrame(frame);
+    m_client->requestGeolocationPermissionForFrame(frame, geolocation);
 }
 
 void Chrome::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser)
 {
     m_client->runOpenPanel(frame, fileChooser);
 }
 // --------
 
 #if ENABLE(DASHBOARD_SUPPORT)
 void ChromeClient::dashboardRegionsChanged()
@@ skipping 80 matching lines @@
 #if !PLATFORM(MAC)
             for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
                 frame->document()->resumeActiveDOMObjects();
 #endif
         }
     }
 }
 
 
 } // namespace WebCore