| Index: chrome/browser/renderer_host/render_message_filter.cc
|
| diff --git a/chrome/browser/renderer_host/render_message_filter.cc b/chrome/browser/renderer_host/render_message_filter.cc
|
| index b5ed28f19e0c50d6af079dd294e0524d1440281a..fdad432a8a2737ac0a726fa841c5918fbc0e24aa 100644
|
| --- a/chrome/browser/renderer_host/render_message_filter.cc
|
| +++ b/chrome/browser/renderer_host/render_message_filter.cc
|
| @@ -974,12 +974,13 @@ void RenderMessageFilter::OnV8HeapStatsOnUIThread(
|
| }
|
|
|
| void RenderMessageFilter::OnDidZoomURL(const IPC::Message& message,
|
| + int request_id,
|
| double zoom_level,
|
| bool remember,
|
| const GURL& url) {
|
| Task* task = NewRunnableMethod(this,
|
| - &RenderMessageFilter::UpdateHostZoomLevelsOnUIThread, zoom_level,
|
| - remember, url, render_process_id_, message.routing_id());
|
| + &RenderMessageFilter::UpdateHostZoomLevelsOnUIThread, request_id,
|
| + zoom_level, remember, url, render_process_id_, message.routing_id());
|
| #if defined(OS_MACOSX)
|
| cocoa_utils::PostTaskInEventTrackingRunLoopMode(FROM_HERE, task);
|
| #else
|
| @@ -988,6 +989,7 @@ void RenderMessageFilter::OnDidZoomURL(const IPC::Message& message,
|
| }
|
|
|
| void RenderMessageFilter::UpdateHostZoomLevelsOnUIThread(
|
| + int request_id,
|
| double zoom_level,
|
| bool remember,
|
| const GURL& url,
|
| @@ -995,7 +997,7 @@ void RenderMessageFilter::UpdateHostZoomLevelsOnUIThread(
|
| int render_view_id) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| if (remember) {
|
| - host_zoom_map_->SetZoomLevel(url, zoom_level);
|
| + host_zoom_map_->SetZoomLevel(url, request_id, zoom_level);
|
| // Notify renderers from this profile.
|
| for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
|
| !i.IsAtEnd(); i.Advance()) {
|
| @@ -1007,7 +1009,7 @@ void RenderMessageFilter::UpdateHostZoomLevelsOnUIThread(
|
| }
|
| } else {
|
| host_zoom_map_->SetTemporaryZoomLevel(
|
| - render_process_id, render_view_id, zoom_level);
|
| + render_process_id, render_view_id, request_id, zoom_level);
|
| }
|
| }
|
|
|
|
|