summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-13 01:53:37 +0000
committermbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-13 01:53:37 +0000
commite25ed64e03257479f1c12145a9443ea66eb8eee9 (patch)
tree168e3b9112429eb0cc5a9fe58a6886498154deb8 /webkit
parent03583a990b8c0e9baa359fce2f9ecbec12ff07cf (diff)
downloadchromium_src-e25ed64e03257479f1c12145a9443ea66eb8eee9.zip
chromium_src-e25ed64e03257479f1c12145a9443ea66eb8eee9.tar.gz
chromium_src-e25ed64e03257479f1c12145a9443ea66eb8eee9.tar.bz2
Move v8-specific code for processing console messages
when displaying javascript alerts into the glue code. This moves them out of DOMWindow.cpp. Review URL: http://codereview.chromium.org/20317 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/chrome_client_impl.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index 18269e1..f23cf43 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -17,6 +17,9 @@ MSVC_PUSH_WARNING_LEVEL(0);
#include "Page.h"
#include "ScriptController.h"
#include "WindowFeatures.h"
+#if USE(V8)
+#include "v8_proxy.h"
+#endif
MSVC_POP_WARNING();
#undef LOG
@@ -311,6 +314,12 @@ void ChromeClientImpl::runJavaScriptAlert(WebCore::Frame* frame,
// 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);
}