Original patch from issue 570048

chrome/renderer/render_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2506 matching lines @@
       checked_state = RENDER_VIEW_COMMAND_CHECKED_STATE_CHECKED;
   }
 
   Send(new ViewHostMsg_CommandStateChanged(
       routing_id_,
       RENDER_VIEW_COMMAND_TOGGLE_SPELL_CHECK,
       is_enabled,
       checked_state));
 }
 
+void RenderView::ReportZoomLevelChanged(int request_id) {
+  bool remember = !webview()->mainFrame()->document().isPluginDocument();
+
+  // Tell the browser which url got zoomed so it can update the menu and the
+  // saved values if necessary
+  Send(new ViewHostMsg_DidZoomURL(
+      routing_id_, request_id, webview()->zoomLevel(), remember,
+      GURL(webview()->mainFrame()->url())));
+}
+
 void RenderView::StartNavStateSyncTimerIfNecessary() {
   int delay;
   if (send_content_state_immediately_)
     delay = 0;
   else if (is_hidden())
     delay = kDelaySecondsForContentStateSyncHidden;
   else
     delay = kDelaySecondsForContentStateSync;
 
   if (nav_state_sync_timer_.IsRunning()) {
@@ skipping 1848 matching lines @@
 }
 
 void RenderView::OnFindReplyAck() {
   // Check if there is any queued up request waiting to be sent.
   if (queued_find_reply_message_.get()) {
     // Send the search result over to the browser process.
     Send(queued_find_reply_message_.release());
   }
 }
 
+void RenderView::AddErrorToRootConsole(const string16& message) {
+  if (webview() && webview()->mainFrame()) {
+    webview()->mainFrame()->addMessageToConsole(
+        WebConsoleMessage(WebConsoleMessage::LevelError, message));
+  }
+}
+
 bool RenderView::AllowContentType(ContentSettingsType settings_type) {
   // CONTENT_SETTING_ASK is only valid for cookies.
   return current_content_settings_.settings[settings_type] !=
     CONTENT_SETTING_BLOCK;
 }
 
 void RenderView::DidBlockContentType(ContentSettingsType settings_type,
                                      const std::string& resource_identifier) {
   if (!content_blocked_[settings_type]) {
     content_blocked_[settings_type] = true;
@@ skipping 71 matching lines @@
     } else {
       // We're going towards 100%, so first go to the next whole number.
       zoom_level = static_cast<int>(old_zoom_level);
     }
   }
 
   webview()->setZoomLevel(false, zoom_level);
   zoomLevelChanged();
 }
 
-void RenderView::OnSetZoomLevel(double zoom_level) {
-  // Don't set zoom level for full-page plugin since they don't use the same
-  // zoom settings.
-  if (webview()->mainFrame()->document().isPluginDocument())
-    return;
-
+void RenderView::OnSetZoomLevel(int request_id, double zoom_level) {
   webview()->hidePopups();
   webview()->setZoomLevel(false, zoom_level);
-  zoomLevelChanged();
+  ReportZoomLevelChanged(request_id);
 }
 
 void RenderView::OnSetContentSettingsForLoadingURL(
     const GURL& url,
     const ContentSettings& content_settings) {
   host_content_settings_[url] = content_settings;
 }
 
 void RenderView::OnSetZoomLevelForLoadingURL(const GURL& url,
                                              double zoom_level) {
@@ skipping 1161 matching lines @@
   int minimum_percent = static_cast<int>(
       WebView::zoomLevelToZoomFactor(minimum_level) * 100);
   int maximum_percent = static_cast<int>(
       WebView::zoomLevelToZoomFactor(maximum_level) * 100);
 
   Send(new ViewHostMsg_UpdateZoomLimits(
       routing_id_, minimum_percent, maximum_percent, remember));
 }
 
 void RenderView::zoomLevelChanged() {
-  bool remember = !webview()->mainFrame()->document().isPluginDocument();
-
-  // Tell the browser which url got zoomed so it can update the menu and the
-  // saved values if necessary
-  Send(new ViewHostMsg_DidZoomURL(
-      routing_id_, webview()->zoomLevel(), remember,
-      GURL(webview()->mainFrame()->url())));
+  // Currently only extension zoom requests have a request id
+  ReportZoomLevelChanged(-1);
 }
 
 bool RenderView::IsNonLocalTopLevelNavigation(
     const GURL& url, WebKit::WebFrame* frame, WebKit::WebNavigationType type) {
   // Must be a top level frame.
   if (frame->parent() != NULL)
     return false;
 
   // Navigations initiated within Webkit are not sent out to the external host
   // in the following cases.
@@ skipping 53 matching lines @@
     // If you hit this please file a bug against jcivelli and include the page
     // and steps to repro.
     NOTREACHED();
     return;
   }
   external_popup_menu_->DidSelectItem(selected_index);
   external_popup_menu_.reset();
 }
 #endif
 
-void RenderView::AddErrorToRootConsole(const string16& message) {
-  if (webview() && webview()->mainFrame()) {
-    webview()->mainFrame()->addMessageToConsole(
-        WebConsoleMessage(WebConsoleMessage::LevelError, message));
-  }
-}
-
 #if defined(ENABLE_FLAPPER_HACKS)
 void RenderView::OnConnectTcpACK(
     int request_id,
     IPC::PlatformFileForTransit socket_for_transit,
     const PP_Flash_NetAddress& local_addr,
     const PP_Flash_NetAddress& remote_addr) {
   pepper_delegate_.OnConnectTcpACK(
       request_id,
       IPC::PlatformFileForTransitToPlatformFile(socket_for_transit),
       local_addr,
       remote_addr);
 }
 #endif
 
 void RenderView::OnJavaScriptStressTestControl(int cmd, int param) {
   if (cmd == kJavaScriptStressTestSetStressRunType) {
     v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param));
   } else if (cmd == kJavaScriptStressTestPrepareStressRun) {
     v8::Testing::PrepareStressRun(param);
   }
 }
 
 void RenderView::OnContextMenuClosed(
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }