Page zoom improvements

content/public/common/page_zoom.cc

Index: content/public/common/page_zoom.cc
===================================================================
--- content/public/common/page_zoom.cc	(revision 0)
+++ content/public/common/page_zoom.cc	(revision 0)
@@ -0,0 +1,73 @@
+// 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 <cmath>
+
+#include "content/public/common/page_zoom.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+
+namespace content {
+
+enum PageZoomValueType {
+  PAGE_ZOOM_VALUE_TYPE_FACTOR,
+  PAGE_ZOOM_VALUE_TYPE_LEVEL,
+};
+
+const double kMinimumZoomFactor = 0.25;
+const double kMaximumZoomFactor = 5.0;
+
+const double kPresetZoomFactors[] = { 0.25, 0.333, 0.5, 0.666, 0.75, 0.9, 1.0,

[jam, 2011/11/21 18:24:39]

these preset values are all chrome-specific. other embedders might want
different values. since it's related to UI, it really doesn't belong in content
(http://www.chromium.org/developers/content-module), and seems like it belongs
in chrome code. same applies for the functions below.

[csilv, 2011/11/21 21:44:58]

Done (relocated to chrome/browser as recommended).

+                                      1.1, 1.25, 1.5, 1.75, 2.0, 2.5, 3.0, 4.0,
+                                      5.0 };
+
+std::vector<double> PresetZoomValues(PageZoomValueType value_type,
+                                     double custom_value) {
+  // Generate a vector of zoom values from an array of known preset
+  // factors. The values in content::kPresetZoomFactors will already be in
+  // sorted order.
+  std::vector<double> zoom_values;
+  bool found_custom = false;
+  for (size_t i = 0; i < arraysize(kPresetZoomFactors); i++) {
+    double zoom_value = content::kPresetZoomFactors[i];
+    if (value_type == PAGE_ZOOM_VALUE_TYPE_LEVEL)
+      zoom_value = WebKit::WebView::zoomFactorToZoomLevel(zoom_value);
+    if (ZoomValuesEqual(zoom_value, custom_value))
+      found_custom = true;
+    zoom_values.push_back(zoom_value);
+  }
+  // If the preset array did not contain the custom value, append it to the
+  // vector and then sort.
+  double min = value_type == PAGE_ZOOM_VALUE_TYPE_LEVEL ?
+      WebKit::WebView::zoomFactorToZoomLevel(kMinimumZoomFactor) :
+      kMinimumZoomFactor;
+  double max = value_type == PAGE_ZOOM_VALUE_TYPE_LEVEL ?
+      WebKit::WebView::zoomFactorToZoomLevel(kMaximumZoomFactor) :
+      kMaximumZoomFactor;
+  if (!found_custom && custom_value > min && custom_value < max) {
+    zoom_values.push_back(custom_value);
+    std::sort(zoom_values.begin(), zoom_values.end());
+  }
+  return zoom_values;
+}
+
+std::vector<double> PresetZoomFactors(double custom_factor) {
+  return PresetZoomValues(PAGE_ZOOM_VALUE_TYPE_FACTOR, custom_factor);
+}
+
+std::vector<double> PresetZoomLevels(double custom_level) {
+  return PresetZoomValues(PAGE_ZOOM_VALUE_TYPE_LEVEL, custom_level);
+}
+
+bool ZoomValuesEqual(double value_a, double value_b) {
+  // Epsilon value for comparing two floating-point zoom values. We don't use
+  // std::numeric_limits<> because it is too precise for zoom values. Zoom
+  // values loose precision due to factor/level conversions. A value of 0.001
+  // is precise enough for zoom value comparisons.
+  const double epsilon = 0.001;
+
+  return (std::fabs(value_a - value_b) <= epsilon);
+}
+
+}  // namespace content
+
Property changes on: content/public/common/page_zoom.cc
___________________________________________________________________
Added: svn:eol-style
   + LF