Rename various text zoom related stuff to be more generic, since we now can...

webkit/glue/webview_impl.cc

 /*
 * Copyright 2007 Google Inc. All Rights Reserved.
 *
 * Portions Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
 *
 * ***** BEGIN LICENSE BLOCK *****
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@@ skipping 122 matching lines @@
   return instance;
 }
 
 WebViewImpl::WebViewImpl()
     : delegate_(NULL),
       pending_history_item_(NULL),
       observed_new_navigation_(false),
 #ifndef NDEBUG
       new_navigation_loader_(NULL),
 #endif
-      text_zoom_level_(0),
+      zoom_level_(0),
       context_menu_allowed_(false),
       doing_drag_and_drop_(false),
       suppress_next_keypress_event_(false),
       window_open_disposition_(IGNORE_ACTION),
       ime_accept_events_(true) {
   // WebKit/win/WebView.cpp does the same thing, except they call the
   // KJS specific wrapper around this method. We need to have threading
   // initialized because CollatorICU requires it.
   WTF::initializeThreading();
 
@@ skipping 997 matching lines @@
 
 // Return the canonical encoding name of current main webframe in webview.
 std::wstring WebViewImpl::GetMainFrameEncodingName() {
   if (!main_frame_)
     return std::wstring(L"");
 
   String encoding_name = main_frame_->frame()->loader()->encoding();
   return webkit_glue::StringToStdWString(encoding_name);
 }
 
-void WebViewImpl::MakeTextLarger() {
+void WebViewImpl::ZoomIn(bool text_only) {
   Frame* frame = main_frame()->frame();
   double multiplier = std::min(std::pow(kTextSizeMultiplierRatio,
-                                        text_zoom_level_ + 1),
+                                        zoom_level_ + 1),
                                kMaxTextSizeMultiplier);
   float zoom_factor = static_cast<float>(multiplier);
   if (zoom_factor != frame->zoomFactor()) {
-    ++text_zoom_level_;
-    frame->setZoomFactor(zoom_factor, false);
+    ++zoom_level_;
+    frame->setZoomFactor(zoom_factor, text_only);
   }
 }
 
-void WebViewImpl::MakeTextSmaller() {
+void WebViewImpl::ZoomOut(bool text_only) {
   Frame* frame = main_frame()->frame();
   double multiplier = std::max(std::pow(kTextSizeMultiplierRatio,
-                                        text_zoom_level_ - 1),
+                                        zoom_level_ - 1),
                                kMinTextSizeMultiplier);
   float zoom_factor = static_cast<float>(multiplier);
   if (zoom_factor != frame->zoomFactor()) {
-    --text_zoom_level_;
-    frame->setZoomFactor(zoom_factor, false);
+    --zoom_level_;
+    frame->setZoomFactor(zoom_factor, text_only);
   }
 }
 
-void WebViewImpl::MakeTextStandardSize() {
-  text_zoom_level_ = 0;
-  main_frame()->frame()->setZoomFactor(1.0f, false);
+void WebViewImpl::ResetZoom() {
+  // We don't change the zoom mode (text only vs. full page) here. We just want
+  // to reset whatever is already set.
+  zoom_level_ = 0;
+  main_frame()->frame()->setZoomFactor(
+      1.0f,
+      main_frame()->frame()->isZoomFactorTextOnly());
 }
 
 void WebViewImpl::CopyImageAt(int x, int y) {
   IntPoint point = IntPoint(x, y);
 
   Frame* frame = main_frame_->frame();
   if (!frame)
     return;
 
   HitTestResult result =
@@ skipping 339 matching lines @@
 }
 
 void WebViewImpl::DeleteImageResourceFetcher(ImageResourceFetcher* fetcher) {
   DCHECK(image_fetchers_.find(fetcher) != image_fetchers_.end());
   image_fetchers_.erase(fetcher);
 
   // We're in the callback from the ImageResourceFetcher, best to delay
   // deletion.
   MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher);
 }