Make JavaScript alerts reflect the URL of the frame they came from, not the...

webkit/glue/chrome_client_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "Cursor.h"
@@ skipping 271 matching lines @@
     std::wstring wstr_message = webkit_glue::StringToStdWString(message);
     std::wstring wstr_source_id = webkit_glue::StringToStdWString(source_id);
     d->AddMessageToConsole(webview_, wstr_message, line_no, wstr_source_id);
   }
 }
 
 bool ChromeClientImpl::canRunBeforeUnloadConfirmPanel() {
   return webview_->delegate() != NULL;
 }
 
-bool ChromeClientImpl::runBeforeUnloadConfirmPanel(const WebCore::String& message,
-                                                   WebCore::Frame* frame) {
+bool ChromeClientImpl::runBeforeUnloadConfirmPanel(
+    const WebCore::String& message,
+    WebCore::Frame* frame) {
   WebViewDelegate* d = webview_->delegate();
   if (d) {
     std::wstring wstr = webkit_glue::StringToStdWString(message);
-    return d->RunBeforeUnloadConfirm(webview_, wstr);
+    return d->RunBeforeUnloadConfirm(WebFrameImpl::FromFrame(frame), wstr);
   }
   return false;
 }
 
 void ChromeClientImpl::closeWindowSoon() {
   // Make sure this Page can no longer be found by JS.
   webview_->page()->setGroupName(WebCore::String());
 
   // Make sure that all loading is stopped.  Ensures that JS stops executing!
   webview_->StopLoading();
@@ skipping 10 matching lines @@
   // Pass the request on to the WebView delegate, for more control.
   WebViewDelegate* d = webview_->delegate();
   if (d) {
 #if USE(V8)
     // Before showing the JavaScript dialog, we give the proxy implementation
     // a chance to process any pending console messages.
     WebCore::V8Proxy::ProcessConsoleMessages();
 #endif
 
     std::wstring wstr = webkit_glue::StringToStdWString(message);
-    d->RunJavaScriptAlert(webview_, wstr);
+    d->RunJavaScriptAlert(WebFrameImpl::FromFrame(frame), wstr);
   }
 }
 
 // See comments for runJavaScriptAlert().
 bool ChromeClientImpl::runJavaScriptConfirm(WebCore::Frame* frame,
                                             const WebCore::String& message) {
   WebViewDelegate* d = webview_->delegate();
   if (d) {
     std::wstring wstr = webkit_glue::StringToStdWString(message);
-    return d->RunJavaScriptConfirm(webview_, wstr);
+    return d->RunJavaScriptConfirm(WebFrameImpl::FromFrame(frame), wstr);
   }
   return false;
 }
 
 // See comments for runJavaScriptAlert().
 bool ChromeClientImpl::runJavaScriptPrompt(WebCore::Frame* frame,
                                            const WebCore::String& message,
                                            const WebCore::String& defaultValue,
                                            WebCore::String& result) {
   WebViewDelegate* d = webview_->delegate();
   if (d) {
     std::wstring wstr_message = webkit_glue::StringToStdWString(message);
     std::wstring wstr_default = webkit_glue::StringToStdWString(defaultValue);
     std::wstring wstr_result;
-    bool ok = d->RunJavaScriptPrompt(webview_,
+    bool ok = d->RunJavaScriptPrompt(WebFrameImpl::FromFrame(frame),
                                      wstr_message,
                                      wstr_default,
                                      &wstr_result);
     if (ok)
       result = webkit_glue::StdWStringToString(wstr_result);
     return ok;
   }
   return false;
 }
 
@@ skipping 169 matching lines @@
   WebViewDelegate* d = webview_->delegate();
   if (d)
     d->DisableSuddenTermination();
 }
 
 void ChromeClientImpl::formStateDidChange(const WebCore::Node*) {
   WebViewDelegate* d = webview_->delegate();
   if (d)
     d->OnNavStateChanged(webview_);
 }