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

webkit/glue/chrome_client_impl.cc

Index: webkit/glue/chrome_client_impl.cc
===================================================================
--- webkit/glue/chrome_client_impl.cc	(revision 10892)
+++ webkit/glue/chrome_client_impl.cc	(working copy)
@@ -289,12 +289,13 @@
   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;
 }
@@ -325,7 +326,7 @@
 #endif
 
     std::wstring wstr = webkit_glue::StringToStdWString(message);
-    d->RunJavaScriptAlert(webview_, wstr);
+    d->RunJavaScriptAlert(WebFrameImpl::FromFrame(frame), wstr);
   }
 }
 
@@ -335,7 +336,7 @@
   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;
 }
@@ -350,7 +351,7 @@
     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);