Remember zoom on a per-host basis....

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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.
 
 #if defined(ENABLE_PEPPER)
 #define PEPPER_APIS_ENABLED
 #endif
 
 #include "chrome/renderer/render_view.h"
 
@@ skipping 418 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_AdvanceToNextMisspelling,
                         OnAdvanceToNextMisspelling)
     IPC_MESSAGE_HANDLER(ViewMsg_ToggleSpellCheck, OnToggleSpellCheck)
     IPC_MESSAGE_HANDLER(ViewMsg_Delete, OnDelete)
     IPC_MESSAGE_HANDLER(ViewMsg_SelectAll, OnSelectAll)
     IPC_MESSAGE_HANDLER(ViewMsg_CopyImageAt, OnCopyImageAt)
     IPC_MESSAGE_HANDLER(ViewMsg_ExecuteEditCommand, OnExecuteEditCommand)
     IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind)
     IPC_MESSAGE_HANDLER(ViewMsg_DeterminePageText, OnDeterminePageText)
     IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
+    IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingHost,
+                        OnSetZoomLevelForLoadingHost)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding)
     IPC_MESSAGE_HANDLER(ViewMsg_ResetPageEncodingToDefault,
                         OnResetPageEncodingToDefault)
     IPC_MESSAGE_HANDLER(ViewMsg_SetupDevToolsClient, OnSetupDevToolsClient)
     IPC_MESSAGE_HANDLER(ViewMsg_DownloadFavIcon, OnDownloadFavIcon)
     IPC_MESSAGE_HANDLER(ViewMsg_ScriptEvalRequest, OnScriptEvalRequest)
     IPC_MESSAGE_HANDLER(ViewMsg_CSSInsertRequest, OnCSSInsertRequest)
     IPC_MESSAGE_HANDLER(ViewMsg_AddMessageToConsole, OnAddMessageToConsole)
     IPC_MESSAGE_HANDLER(ViewMsg_ReservePageIDRange, OnReservePageIDRange)
     IPC_MESSAGE_HANDLER(ViewMsg_FormFill, OnFormFill)
@@ skipping 587 matching lines @@
       navigation_state->password_form_data();
   if (password_form_data)
     params.password_form = *password_form_data;
 
   params.gesture = navigation_gesture_;
   navigation_gesture_ = NavigationGestureUnknown;
 
   if (!frame->parent()) {
     // Top-level navigation.
 
+    // Set zoom level.
+    HostZoomLevels::iterator host =
+        host_zoom_levels_.find(GURL(request.url()).host());
+    if (host != host_zoom_levels_.end()) {
+      webview()->setZoomLevel(false, host->second);
+      // This zoom level was merely recorded transiently for this load.  We can
+      // erase it now.  If at some point we reload this page, the browser will
+      // send us a new, up-to-date zoom level.
+      host_zoom_levels_.erase(host);
+    }
+
     // Update contents MIME type for main frame.
     params.contents_mime_type = ds->response().mimeType().utf8();
 
     params.transition = navigation_state->transition_type();
     if (!PageTransition::IsMainFrame(params.transition)) {
       // If the main frame does a load, it should not be reported as a subframe
       // navigation.  This can occur in the following case:
       // 1. You're on a site with frames.
       // 2. You do a subframe navigation.  This is stored with transition type
       //    MANUAL_SUBFRAME.
@@ skipping 1069 matching lines @@
   // Received a redirect on the main frame.
   WebDataSource* data_source = frame->provisionalDataSource();
   if (!data_source) {
     // Should only be invoked when we have a data source.
     NOTREACHED();
     return;
   }
   std::vector<GURL> redirects;
   GetRedirectChain(data_source, &redirects);
   if (redirects.size() >= 2) {
-    Send(new ViewHostMsg_DidRedirectProvisionalLoad(
-         routing_id_, page_id_, redirects[redirects.size() - 2],
-         redirects[redirects.size() - 1]));
+    Send(new ViewHostMsg_DidRedirectProvisionalLoad(routing_id_, page_id_,
+        redirects[redirects.size() - 2], redirects.back()));
   }
 }
 
-void RenderView::didFailProvisionalLoad(
-    WebFrame* frame, const WebURLError& error) {
+void RenderView::didFailProvisionalLoad(WebFrame* frame,
+                                        const WebURLError& error) {
   // Notify the browser that we failed a provisional load with an error.
   //
   // Note: It is important this notification occur before DidStopLoading so the
   //       SSL manager can react to the provisional load failure before being
   //       notified the load stopped.
   //
   WebDataSource* ds = frame->provisionalDataSource();
   DCHECK(ds);
 
   const WebURLRequest& failed_request = ds->request();
@@ skipping 60 matching lines @@
   // grows too large, then we'll just let it through.
   navigation_state->append_postponed_data(data, data_len);
   if (navigation_state->postponed_data().size() >= 512) {
     navigation_state->set_postpone_loading_data(false);
     frame->commitDocumentData(navigation_state->postponed_data().data(),
                               navigation_state->postponed_data().size());
     navigation_state->clear_postponed_data();
   }
 }
 
-void RenderView::didCommitProvisionalLoad(
-    WebFrame* frame, bool is_new_navigation) {
+void RenderView::didCommitProvisionalLoad(WebFrame* frame,
+                                          bool is_new_navigation) {
   NavigationState* navigation_state =
       NavigationState::FromDataSource(frame->dataSource());
 
   navigation_state->set_commit_load_time(Time::Now());
   if (is_new_navigation) {
     // When we perform a new navigation, we need to update the previous session
     // history entry with state for the page we are leaving.
     UpdateSessionHistory(frame);
 
     // We bump our Page ID to correspond with the new session history entry.
@@ skipping 721 matching lines @@
 
   // We set |determine_page_text_after_loading_stops_| true here so that,
   // after page has been loaded completely, the text in the page is captured.
   determine_page_text_after_loading_stops_ = true;
 }
 
 void RenderView::DnsPrefetch(const std::vector<std::string>& host_names) {
   Send(new ViewHostMsg_DnsPrefetch(host_names));
 }
 
-void RenderView::OnZoom(int function) {
-  static const bool kZoomIsTextOnly = false;
-  switch (function) {
-    case PageZoom::SMALLER:
-      webview()->zoomOut(kZoomIsTextOnly);
-      break;
-    case PageZoom::STANDARD:
-      webview()->zoomDefault();
-      break;
-    case PageZoom::LARGER:
-      webview()->zoomIn(kZoomIsTextOnly);
-      break;
-    default:
-      NOTREACHED();
-  }
+void RenderView::OnZoom(PageZoom::Function function) {
+  if (!webview())  // Not sure if this can happen, but no harm in being safe.
+    return;
+
+  int zoom_level = webview()->zoomLevel();
+  int new_zoom_level = webview()->setZoomLevel(false,
+      (function == PageZoom::RESET) ? 0 : (zoom_level + function));
+
+  // Tell the browser which host got zoomed so it can update the saved values.
+  // Pages like the safe browsing interstitial can have empty hosts; don't
+  // record those.
+  std::string host(GURL(webview()->mainFrame()->url()).host());
+  if (!host.empty())
+    Send(new ViewHostMsg_DidZoomHost(host, new_zoom_level));
+}
+
+void RenderView::OnSetZoomLevelForLoadingHost(std::string host,
+                                              int zoom_level) {
+  host_zoom_levels_[host] = zoom_level;
 }
 
 void RenderView::OnSetPageEncoding(const std::string& encoding_name) {
   webview()->setPageEncoding(WebString::fromUTF8(encoding_name));
 }
 
 void RenderView::OnResetPageEncodingToDefault() {
   WebString no_encoding;
   webview()->setPageEncoding(no_encoding);
 }
@@ skipping 871 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }