summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 03:46:57 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 03:46:57 +0000
commitc1f50aa589d83b9725d4b7f19559eb94c006d818 (patch)
tree87f205ba59418713a3836e52040775ad9bb9fc13 /chrome/renderer/render_view.h
parent4dd29e72c2c234fbffb0c6bf901ee8ccfb2f5637 (diff)
downloadchromium_src-c1f50aa589d83b9725d4b7f19559eb94c006d818.zip
chromium_src-c1f50aa589d83b9725d4b7f19559eb94c006d818.tar.gz
chromium_src-c1f50aa589d83b9725d4b7f19559eb94c006d818.tar.bz2
Modal loops of joy.
We need to pump messages in the renderer and in any related plugin processes when sending sync IPCs to get cookies and set localstorage items because these IPCs can block on a user prompt. This code moves complexity into RenderThread::Send(). That function is now responsible for calling WebView::{willEnter,didExit}ModalLoop() and for broadcasting the messages to signal/reset modal dialog events in the related plugin processes. This change also adds code to optionally suspend the shared webkit timer. This was needed to fix bug 36063. It also helps make spinning a nested loop to wait for document.cookie results a bit less risky since we'll be re-entering WebKit in fewer cases. R=jam BUG=34917,36063 TEST=none Review URL: http://codereview.chromium.org/607011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view.h')
-rw-r--r--chrome/renderer/render_view.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index f9ab206..60deea6 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -157,10 +157,6 @@ class RenderView : public RenderWidget,
return static_cast<WebKit::WebView*>(webwidget());
}
- gfx::NativeViewId host_window() const {
- return host_window_;
- }
-
int browser_window_id() const {
return browser_window_id_;
}
@@ -450,9 +446,6 @@ class RenderView : public RenderWidget,
return webkit_preferences_;
}
- // Sends a message and runs a nested message loop.
- bool SendAndRunNestedMessageLoop(IPC::SyncMessage* message);
-
// Called when the "idle" user script state has been reached. See
// UserScript::DOCUMENT_IDLE.
void OnUserScriptIdleTriggered(WebKit::WebFrame* frame);
@@ -573,6 +566,9 @@ class RenderView : public RenderWidget,
const GURL& frame_url,
std::wstring* result);
+ // Sends a message and runs a nested message loop.
+ bool SendAndRunNestedMessageLoop(IPC::SyncMessage* message);
+
// Adds search provider from the given OpenSearch description URL as a
// keyword search.
void AddGURLSearchProvider(const GURL& osd_url, bool autodetected);