Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1234)

Unified Diff: content/renderer/render_thread_impl.cc

Issue 102763005: Remove the ChromeFrame specific cookie code between the renderer and browser process. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/renderer/content_renderer_client.cc ('k') | content/renderer/renderer_webcookiejar_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
===================================================================
--- content/renderer/render_thread_impl.cc (revision 240900)
+++ content/renderer/render_thread_impl.cc (working copy)
@@ -484,27 +484,18 @@
bool RenderThreadImpl::Send(IPC::Message* msg) {
// Certain synchronous messages cannot always be processed synchronously by
- // the browser, e.g., Chrome frame communicating with the embedding browser.
- // This could cause a complete hang of Chrome if a windowed plug-in is trying
- // to communicate with the renderer thread since the browser's UI thread
- // could be stuck (within a Windows API call) trying to synchronously
- // communicate with the plug-in. The remedy is to pump messages on this
- // thread while the browser is processing this request. This creates an
- // opportunity for re-entrancy into WebKit, so we need to take care to disable
- // callbacks, timers, and pending network loads that could trigger such
- // callbacks.
+ // the browser, e.g., putting up UI and waiting for the user. This could cause
+ // a complete hang of Chrome if a windowed plug-in is trying to communicate
+ // with the renderer thread since the browser's UI thread could be stuck
+ // (within a Windows API call) trying to synchronously communicate with the
+ // plug-in. The remedy is to pump messages on this thread while the browser
+ // is processing this request. This creates an opportunity for re-entrancy
+ // into WebKit, so we need to take care to disable callbacks, timers, and
+ // pending network loads that could trigger such callbacks.
bool pumping_events = false;
if (msg->is_sync()) {
if (msg->is_caller_pumping_messages()) {
pumping_events = true;
- } else {
- if ((msg->type() == ViewHostMsg_GetCookies::ID ||
- msg->type() == ViewHostMsg_GetRawCookies::ID ||
- msg->type() == ViewHostMsg_CookiesEnabled::ID) &&
- GetContentClient()->renderer()->
- ShouldPumpEventsDuringCookieMessage()) {
- pumping_events = true;
- }
}
}
« no previous file with comments | « content/public/renderer/content_renderer_client.cc ('k') | content/renderer/renderer_webcookiejar_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698