summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-20 00:10:55 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-20 00:10:55 +0000
commitee592d4c9d0b419038e29115c5b32bac13251221 (patch)
treee9d3410e9f7e640b25efe6d1e90753dfd47caf20 /chrome
parent941f3186bb04423e1b67640b629062305437beb7 (diff)
downloadchromium_src-ee592d4c9d0b419038e29115c5b32bac13251221.zip
chromium_src-ee592d4c9d0b419038e29115c5b32bac13251221.tar.gz
chromium_src-ee592d4c9d0b419038e29115c5b32bac13251221.tar.bz2
Verify that SendAndRunNestedMessageLoop is the source of the Intl2
page cycler regression. TBR=jam BUG=36310 TEST=none Review URL: http://codereview.chromium.org/650089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index a475616..6bf926a 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -131,8 +131,12 @@ WebString RendererWebKitClientImpl::cookies(
// when there is no active script context.
int32 routing_id = RenderThread::RoutingIDForCurrentContext();
+ // TODO(darin): We should use SendAndRunNestedMessageLoop here to avoid dead-
+ // locking the browser, but this causes a performance regression. Switching
+ // back to Send to verify. See http://crbug.com/36310.
+
std::string value_utf8;
- RenderThread::current()->SendAndRunNestedMessageLoop(
+ RenderThread::current()->Send(
new ViewHostMsg_GetCookies(routing_id, url, first_party_for_cookies,
&value_utf8));