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

webkit/glue/webview_impl.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef WEBKIT_GLUE_WEBVIEW_IMPL_H__
 #define WEBKIT_GLUE_WEBVIEW_IMPL_H__
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gfx/platform_canvas.h"
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "webkit/port/history/BackForwardList.h"
 #include "webkit/port/platform/WidgetClientWin.h"
 MSVC_POP_WARNING();
 
 namespace WebCore {
-  class Frame;
-  class HistoryItem;
-  class KeyboardEvent;
-  class Page;
-  class PlatformKeyboardEvent;
-  class Range;
-  class Widget;
+class Frame;
+class HistoryItem;
+class KeyboardEvent;
+class Page;
+class PlatformKeyboardEvent;
+class Range;
+class Widget;
 }
 
 class ImageResourceFetcher;
 class SearchableFormData;
 struct WebDropData;
 class WebHistoryItemImpl;
 class WebKeyboardEvent;
 class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebViewDelegate;
@@ skipping 31 matching lines @@
   virtual void StopLoading();
   virtual void SetBackForwardListSize(int size);
   virtual void RestoreFocus();
   virtual void SetInitialFocus(bool reverse);
   virtual bool FocusedFrameNeedsSpellchecking();
   virtual bool DownloadImage(int id, const GURL& image_url, int image_size);
   virtual void SetPreferences(const WebPreferences& preferences);
   virtual const WebPreferences& GetPreferences();
   virtual void SetPageEncoding(const std::wstring& encoding_name);
   virtual std::wstring GetMainFrameEncodingName();
-  virtual void MakeTextLarger();
-  virtual void MakeTextSmaller();
-  virtual void MakeTextStandardSize();
+  virtual void ZoomIn(bool text_only);
+  virtual void ZoomOut(bool text_only);
+  virtual void ResetZoom();
   virtual void CopyImageAt(int x, int y);
   virtual void InspectElement(int x, int y);
   virtual void ShowJavaScriptConsole();
   virtual void DragSourceEndedAt(
       int client_x, int client_y, int screen_x, int screen_y);
   virtual void DragSourceMovedTo(
       int client_x, int client_y, int screen_x, int screen_y);
   virtual void DragSourceSystemDragEnded();
   virtual bool DragTargetDragEnter(const WebDropData& drop_data,
       int client_x, int client_y, int screen_x, int screen_y);
@@ skipping 171 matching lines @@
   // The point relative to the client area where the mouse was last pressed
   // down. This is used by the drag client to determine what was under the
   // mouse when the drag was initiated. We need to track this here in
   // WebViewImpl since DragClient::startDrag does not pass the position the
   // mouse was at when the drag was initiated, only the current point, which
   // can be misleading as it is usually not over the element the user actually
   // dragged by the time a drag is initiated.
   gfx::Point last_mouse_down_point_;
 
   // Keeps track of the current text zoom level.  0 means no zoom, positive
-  // values mean larger text, negative numbers mean smaller text.
-  int text_zoom_level_;
+  // values mean larger text, negative numbers mean smaller.
+  int zoom_level_;
 
   bool context_menu_allowed_;
 
   bool doing_drag_and_drop_;
 
   // Webkit expects keyPress events to be suppressed if the associated keyDown
   // event was handled. Safari implements this behavior by peeking out the
   // associated WM_CHAR event if the keydown was handled. We emulate
   // this behavior by setting this flag if the keyDown was handled.
   bool suppress_next_keypress_event_;
@@ skipping 12 matching lines @@
     return g_current_input_event;
   }
 private:
   static const WebInputEvent* g_current_input_event;
 
   DISALLOW_EVIL_CONSTRUCTORS(WebViewImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBVIEW_IMPL_H__