Make command-zero reset page scale in addition to zoom level

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 642 matching lines @@
 #if defined(OS_WIN)
       focused_plugin_id_(-1),
 #endif
 #if defined(ENABLE_PLUGINS)
       plugin_find_handler_(NULL),
       focused_pepper_plugin_(NULL),
       pepper_last_mouse_event_target_(NULL),
 #endif
       enumeration_completion_id_(0),
       session_storage_namespace_id_(params.session_storage_namespace_id),
-      next_snapshot_id_(0) {
+      next_snapshot_id_(0),
+      page_scale_factor_is_one_(true) {
 }
 
 void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
                                 CompositorDependencies* compositor_deps,
                                 bool was_created_by_renderer) {
   routing_id_ = params.view_id;
   surface_id_ = params.surface_id;
   if (params.opener_route_id != MSG_ROUTING_NONE && was_created_by_renderer)
     opener_id_ = params.opener_route_id;
 
@@ skipping 604 matching lines @@
     IPC_MESSAGE_HANDLER(InputMsg_ExecuteEditCommand, OnExecuteEditCommand)
     IPC_MESSAGE_HANDLER(InputMsg_MoveCaret, OnMoveCaret)
     IPC_MESSAGE_HANDLER(InputMsg_ScrollFocusedEditableNodeIntoRect,
                         OnScrollFocusedEditableNodeIntoRect)
     IPC_MESSAGE_HANDLER(InputMsg_SetEditCommandsForNextKeyEvent,
                         OnSetEditCommandsForNextKeyEvent)
     IPC_MESSAGE_HANDLER(ViewMsg_CopyImageAt, OnCopyImageAt)
     IPC_MESSAGE_HANDLER(ViewMsg_SaveImageAt, OnSaveImageAt)
     IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind)
     IPC_MESSAGE_HANDLER(ViewMsg_StopFinding, OnStopFinding)
+    IPC_MESSAGE_HANDLER(ViewMsg_ResetPageScale, OnResetPageScale)
     IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingURL,
                         OnSetZoomLevelForLoadingURL)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForView,
                         OnSetZoomLevelForView)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding)
     IPC_MESSAGE_HANDLER(ViewMsg_ResetPageEncodingToDefault,
                         OnResetPageEncodingToDefault)
     IPC_MESSAGE_HANDLER(ViewMsg_PostMessageEvent, OnPostMessageEvent)
     IPC_MESSAGE_HANDLER(DragMsg_TargetDragEnter, OnDragTargetDragEnter)
@@ skipping 1375 matching lines @@
   }
 
   gfx::RectF active_rect = main_frame->activeFindMatchRect();
   Send(new ViewHostMsg_FindMatchRects_Reply(routing_id_,
                                                rects_version,
                                                match_rects,
                                                active_rect));
 }
 #endif
 
+void RenderViewImpl::OnResetPageScale() {
+  if (!webview())
+    return;
+  webview()->setPageScaleFactor(1);
+}
+
 void RenderViewImpl::OnZoom(PageZoom zoom) {
   if (!webview())  // Not sure if this can happen, but no harm in being safe.
     return;
 
   webview()->hidePopups();
 
   double old_zoom_level = webview()->zoomLevel();
   double zoom_level;
   if (zoom == PAGE_ZOOM_RESET) {
     zoom_level = 0;
@@ skipping 982 matching lines @@
   // zoom level (from RendererPreferences) before the first navigation.
   if (!webview()->mainFrame()->document().url().isEmpty()) {
     // 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_, zoom_level,
         GURL(webview()->mainFrame()->document().url())));
   }
 }
 
+void RenderViewImpl::pageScaleFactorChanged() {
+  if (!webview())
+    return;
+  bool page_scale_factor_is_one = webview()->pageScaleFactor() == 1;
+  if (page_scale_factor_is_one == page_scale_factor_is_one_)
+    return;
+  page_scale_factor_is_one_ = page_scale_factor_is_one;
+  Send(new ViewHostMsg_PageScaleFactorIsOneChanged(routing_id_,
+                                                   page_scale_factor_is_one_));
+}
+
 double RenderViewImpl::zoomLevelToZoomFactor(double zoom_level) const {
   return ZoomLevelToZoomFactor(zoom_level);
 }
 
 double RenderViewImpl::zoomFactorToZoomLevel(double factor) const {
   return ZoomFactorToZoomLevel(factor);
 }
 
 void RenderViewImpl::registerProtocolHandler(const WebString& scheme,
                                              const WebURL& url,
@@ skipping 302 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content