Consolidate page zoom limits and conversions in blink/public/
We have the min/max page zoom factors limits and methods to convert
between "page zoom factor" and "page zoom level" in
- content/common/page_zoom.h
- blink/renderer/core/exported/web_view_impl.cc
- blink/public/web/web_view.h
Instead of duplicating the limits and the logic, consolidate it all
into a single blink public header. content/browser/ and components
are able to include blink public headers, they just can't link against
blink.
The new site is in blink/public/common/page/page_zoom.h
This updates all callers to point to this common site, and removes
the redundant ones in content/common/ and WebView{Impl}.
[email protected]
TBR=darin
Bug: 419087
Change-Id: Ib89f022d96c9ac7ebfd4b84c08f666a25458725a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1814857
Commit-Queue: danakj <[email protected]>
Reviewed-by: Darin Fisher <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Auto-Submit: danakj <[email protected]>
Cr-Commit-Position: refs/heads/master@{#699424}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index cfaab6e90..f408405 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -132,7 +132,6 @@
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/page_state.h"
-#include "content/public/common/page_zoom.h"
#include "content/public/common/referrer_type_converters.h"
#include "content/public/common/result_codes.h"
#include "content/public/common/url_utils.h"
@@ -153,6 +152,7 @@
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/common/mime_util/mime_util.h"
+#include "third_party/blink/public/common/page/page_zoom.h"
#include "third_party/blink/public/mojom/loader/pause_subresource_loading_handle.mojom.h"
#include "third_party/blink/public/mojom/mediastream/media_stream.mojom-shared.h"
#include "third_party/blink/public/platform/web_security_style.h"
@@ -572,8 +572,10 @@
is_showing_before_unload_dialog_(false),
last_active_time_(base::TimeTicks::Now()),
closed_by_user_gesture_(false),
- minimum_zoom_percent_(static_cast<int>(kMinimumZoomFactor * 100)),
- maximum_zoom_percent_(static_cast<int>(kMaximumZoomFactor * 100)),
+ minimum_zoom_percent_(
+ static_cast<int>(blink::kMinimumPageZoomFactor * 100)),
+ maximum_zoom_percent_(
+ static_cast<int>(blink::kMaximumPageZoomFactor * 100)),
zoom_scroll_remainder_(0),
fullscreen_widget_process_id_(ChildProcessHost::kInvalidUniqueID),
fullscreen_widget_routing_id_(MSG_ROUTING_NONE),
