5621488: Apply consistent naming conventions to zoom values | https://chromium-review.googlesource.com/c/chromium/src/+/5621488

shell/browser/api/electron_api_web_contents.cc

@@ -3595,13 +3595,13 @@ void WebContents::SetZoomFactor(gin_helper::ErrorThrower thrower,
     return;
   }
 
-  auto level = blink::PageZoomFactorToZoomLevel(factor);
+  auto level = blink::ZoomFactorToZoomLevel(factor);
   SetZoomLevel(level);
 }
 
 double WebContents::GetZoomFactor() const {
   auto level = GetZoomLevel();
-  return blink::PageZoomLevelToZoomFactor(level);
+  return blink::ZoomLevelToZoomFactor(level);
 }
 
 void WebContents::SetTemporaryZoomLevel(double level) {

shell/browser/electron_browser_context.cc

@@ -174,7 +174,7 @@ std::optional<int> GetZoomLevel(content::WebContents* capturer,
     return std::nullopt;
   }
 
-  double zoom_level = blink::PageZoomLevelToZoomFactor(
+  double zoom_level = blink::ZoomLevelToZoomFactor(
       content::HostZoomMap::GetZoomLevel(captured_wc));
   return std::round(100 * zoom_level);
 }

shell/browser/extensions/api/tabs/tabs_api.cc

@@ -365,11 +365,10 @@ ExtensionFunction::ResponseAction TabsSetZoomFunction::Run() {
     return RespondNow(Error(error));
 
   auto* zoom_controller = contents->GetZoomController();
-  double zoom_level =
-      params->zoom_factor > 0
-          ? blink::PageZoomFactorToZoomLevel(params->zoom_factor)
-          : blink::PageZoomFactorToZoomLevel(
-                zoom_controller->default_zoom_factor());
+  double zoom_level = params->zoom_factor > 0
+                          ? blink::ZoomFactorToZoomLevel(params->zoom_factor)
+                          : blink::ZoomFactorToZoomLevel(
+                                zoom_controller->default_zoom_factor());
 
   zoom_controller->SetZoomLevel(zoom_level);
 
@@ -387,7 +386,7 @@ ExtensionFunction::ResponseAction TabsGetZoomFunction::Run() {
     return RespondNow(Error("No such tab"));
 
   double zoom_level = contents->GetZoomController()->GetZoomLevel();
-  double zoom_factor = blink::PageZoomLevelToZoomFactor(zoom_level);
+  double zoom_factor = blink::ZoomLevelToZoomFactor(zoom_level);
 
   return RespondNow(ArgumentList(tabs::GetZoom::Results::Create(zoom_factor)));
 }
@@ -408,7 +407,7 @@ ExtensionFunction::ResponseAction TabsGetZoomSettingsFunction::Run() {
   tabs::ZoomSettings zoom_settings;
   ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
   zoom_settings.default_zoom_factor =
-      blink::PageZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel());
+      blink::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel());
 
   return RespondNow(
       ArgumentList(tabs::GetZoomSettings::Results::Create(zoom_settings)));

shell/browser/ui/inspectable_web_contents.cc

@@ -127,15 +127,15 @@ void SetZoomLevelForWebContents(content::WebContents* web_contents,
 }
 
 double GetNextZoomLevel(double level, bool out) {
-  double factor = blink::PageZoomLevelToZoomFactor(level);
+  double factor = blink::ZoomLevelToZoomFactor(level);
   size_t size = std::size(kPresetZoomFactors);
   for (size_t i = 0; i < size; ++i) {
-    if (!blink::PageZoomValuesEqual(kPresetZoomFactors[i], factor))
+    if (!blink::ZoomValuesEqual(kPresetZoomFactors[i], factor))
       continue;
     if (out && i > 0)
-      return blink::PageZoomFactorToZoomLevel(kPresetZoomFactors[i - 1]);
+      return blink::ZoomFactorToZoomLevel(kPresetZoomFactors[i - 1]);
     if (!out && i != size - 1)
-      return blink::PageZoomFactorToZoomLevel(kPresetZoomFactors[i + 1]);
+      return blink::ZoomFactorToZoomLevel(kPresetZoomFactors[i + 1]);
   }
   return level;
 }

shell/browser/web_contents_zoom_controller.cc

@@ -84,7 +84,7 @@ bool WebContentsZoomController::SetZoomLevel(double level) {
   // Do not actually rescale the page in manual mode.
   if (zoom_mode_ == ZOOM_MODE_MANUAL) {
     // If the zoom level hasn't changed, early out to avoid sending an event.
-    if (blink::PageZoomValuesEqual(zoom_level_, level))
+    if (blink::ZoomValuesEqual(zoom_level_, level))
       return true;
 
     double old_zoom_level = zoom_level_;
@@ -333,7 +333,7 @@ void WebContentsZoomController::RenderFrameHostChanged(
 void WebContentsZoomController::SetZoomFactorOnNavigationIfNeeded(
     const GURL& url) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (blink::PageZoomValuesEqual(default_zoom_factor(), kPageZoomEpsilon))
+  if (blink::ZoomValuesEqual(default_zoom_factor(), kPageZoomEpsilon))
     return;
 
   content::GlobalRenderFrameHostId old_rfh_id_ =
@@ -357,11 +357,11 @@ void WebContentsZoomController::SetZoomFactorOnNavigationIfNeeded(
   std::string host = net::GetHostOrSpecFromURL(url);
   std::string scheme = url.scheme();
   double zoom_factor = default_zoom_factor();
-  double zoom_level = blink::PageZoomFactorToZoomLevel(zoom_factor);
+  double zoom_level = blink::ZoomFactorToZoomLevel(zoom_factor);
   if (host_zoom_map_->HasZoomLevel(scheme, host)) {
     zoom_level = host_zoom_map_->GetZoomLevelForHostAndScheme(scheme, host);
   }
-  if (blink::PageZoomValuesEqual(zoom_level, GetZoomLevel()))
+  if (blink::ZoomValuesEqual(zoom_level, GetZoomLevel()))
     return;
 
   SetZoomLevel(zoom_level);

shell/browser/web_view_guest_delegate.cc

@@ -76,13 +76,13 @@ void WebViewGuestDelegate::OnZoomChanged(
     if (data.temporary) {
       zoom_controller->SetTemporaryZoomLevel(data.new_zoom_level);
     } else {
-      if (blink::PageZoomValuesEqual(data.new_zoom_level,
-                                     zoom_controller->GetZoomLevel()))
+      if (blink::ZoomValuesEqual(data.new_zoom_level,
+                                 zoom_controller->GetZoomLevel()))
         return;
       zoom_controller->SetZoomLevel(data.new_zoom_level);
     }
     // Change the default zoom factor to match the embedders' new zoom level.
-    double zoom_factor = blink::PageZoomLevelToZoomFactor(data.new_zoom_level);
+    double zoom_factor = blink::ZoomLevelToZoomFactor(data.new_zoom_level);
     zoom_controller->SetDefaultZoomFactor(zoom_factor);
   }
 }

shell/browser/zoom_level_delegate.cc

@@ -53,7 +53,7 @@ ZoomLevelDelegate::ZoomLevelDelegate(PrefService* pref_service,
 ZoomLevelDelegate::~ZoomLevelDelegate() = default;
 
 void ZoomLevelDelegate::SetDefaultZoomLevelPref(double level) {
-  if (blink::PageZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel()))
+  if (blink::ZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel()))
     return;
 
   ScopedDictPrefUpdate update(pref_service_, kPartitionDefaultZoomLevel);
@@ -79,7 +79,7 @@ void ZoomLevelDelegate::OnZoomLevelChanged(
   base::Value::Dict& host_zoom_dictionaries = update.Get();
 
   bool modification_is_removal =
-      blink::PageZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel());
+      blink::ZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel());
 
   base::Value::Dict* host_zoom_dictionary =
       host_zoom_dictionaries.FindDict(partition_key_);
@@ -109,8 +109,8 @@ void ZoomLevelDelegate::ExtractPerHostZoomLevels(
     // will ignore type B values, thus, to have consistency with HostZoomMap's
     // internal state, these values must also be removed from Prefs.
     if (host.empty() || !zoom_level.has_value() ||
-        blink::PageZoomValuesEqual(zoom_level.value(),
-                                   host_zoom_map_->GetDefaultZoomLevel())) {
+        blink::ZoomValuesEqual(zoom_level.value(),
+                               host_zoom_map_->GetDefaultZoomLevel())) {
       keys_to_remove.push_back(host);
       continue;
     }

shell/renderer/api/electron_api_web_frame.cc

@@ -469,12 +469,12 @@ class WebFrameRenderer : public gin::Wrappable<WebFrameRenderer>,
       return;
     }
 
-    SetZoomLevel(thrower.isolate(), blink::PageZoomFactorToZoomLevel(factor));
+    SetZoomLevel(thrower.isolate(), blink::ZoomFactorToZoomLevel(factor));
   }
 
   double GetZoomFactor(v8::Isolate* isolate) {
     double zoom_level = GetZoomLevel(isolate);
-    return blink::PageZoomLevelToZoomFactor(zoom_level);
+    return blink::ZoomLevelToZoomFactor(zoom_level);
   }
 
   v8::Local<v8::Value> GetWebPreference(v8::Isolate* isolate,