Commit 8ba99ed4 authored by dpapad's avatar dpapad Committed by Commit Bot

Cleanup: Remove unused content::HostZoomMapImpl methods.

 - SetZoomLevelForView() was not used anywhere.
 - GetZoomLevelForView() was only used in a test. Replaced with GetZoomLevel().

Bug: None
Change-Id: If481d2477e924a4119d49ba586679c63d0320fc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1877647
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarJames MacLean <wjmaclean@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711438}
parent 04f4f1d3
...@@ -389,17 +389,6 @@ void HostZoomMapImpl::SetZoomLevelForWebContents( ...@@ -389,17 +389,6 @@ void HostZoomMapImpl::SetZoomLevelForWebContents(
} }
} }
void HostZoomMapImpl::SetZoomLevelForView(int render_process_id,
int render_view_id,
double level,
const std::string& host) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (UsesTemporaryZoomLevel(render_process_id, render_view_id))
SetTemporaryZoomLevel(render_process_id, render_view_id, level);
else
SetZoomLevelForHost(host, level);
}
void HostZoomMapImpl::SetPageScaleFactorIsOneForView(int render_process_id, void HostZoomMapImpl::SetPageScaleFactorIsOneForView(int render_process_id,
int render_view_id, int render_view_id,
bool is_one) { bool is_one) {
...@@ -466,19 +455,6 @@ void HostZoomMapImpl::SetTemporaryZoomLevel(int render_process_id, ...@@ -466,19 +455,6 @@ void HostZoomMapImpl::SetTemporaryZoomLevel(int render_process_id,
zoom_level_changed_callbacks_.Notify(change); zoom_level_changed_callbacks_.Notify(change);
} }
double HostZoomMapImpl::GetZoomLevelForView(const GURL& url,
int render_process_id,
int render_view_id) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
RenderViewKey key(render_process_id, render_view_id);
if (base::Contains(temporary_zoom_levels_, key))
return temporary_zoom_levels_.find(key)->second;
return GetZoomLevelForHostAndScheme(url.scheme(),
net::GetHostOrSpecFromURL(url));
}
void HostZoomMapImpl::ClearZoomLevels(base::Time delete_begin, void HostZoomMapImpl::ClearZoomLevels(base::Time delete_begin,
base::Time delete_end) { base::Time delete_end) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
......
...@@ -70,25 +70,12 @@ class CONTENT_EXPORT HostZoomMapImpl : public HostZoomMap { ...@@ -70,25 +70,12 @@ class CONTENT_EXPORT HostZoomMapImpl : public HostZoomMap {
void SetZoomLevelForWebContents(WebContentsImpl* web_contents_impl, void SetZoomLevelForWebContents(WebContentsImpl* web_contents_impl,
double level); double level);
// Sets the zoom level for the specified view. The level may be set for only
// this view, or for the host, depending on UsesTemporaryZoomLevel().
void SetZoomLevelForView(int render_process_id,
int render_view_id,
double level,
const std::string& host);
// Returns the temporary zoom level that's only valid for the lifetime of // Returns the temporary zoom level that's only valid for the lifetime of
// the given WebContents (i.e. isn't saved and doesn't affect other // the given WebContents (i.e. isn't saved and doesn't affect other
// WebContentses) if it exists, the default zoom level otherwise. // WebContentses) if it exists, the default zoom level otherwise.
double GetTemporaryZoomLevel(int render_process_id, double GetTemporaryZoomLevel(int render_process_id,
int render_view_id) const; int render_view_id) const;
// Returns the zoom level regardless of whether it's temporary, host-keyed or
// scheme+host-keyed.
double GetZoomLevelForView(const GURL& url,
int render_process_id,
int render_view_id);
void SendErrorPageZoomLevelRefresh(); void SendErrorPageZoomLevelRefresh();
void WillCloseRenderView(int render_process_id, int render_view_id); void WillCloseRenderView(int render_process_id, int render_view_id);
......
...@@ -39,19 +39,17 @@ void RunTestForURL(const GURL& url, ...@@ -39,19 +39,17 @@ void RunTestForURL(const GURL& url,
// Assume caller has set the zoom level to |host_zoom_level| using // Assume caller has set the zoom level to |host_zoom_level| using
// either a host or host+scheme entry in the HostZoomMap prior to // either a host or host+scheme entry in the HostZoomMap prior to
// calling this function. // calling this function.
EXPECT_DOUBLE_EQ(host_zoom_level, host_zoom_map->GetZoomLevelForView( EXPECT_DOUBLE_EQ(host_zoom_level, host_zoom_map->GetZoomLevel(web_contents));
url, process_id, view_id));
// Make sure that GetZoomLevelForView() works for temporary zoom levels. // Make sure that GetZoomLevel() works for temporary zoom levels.
host_zoom_map->SetTemporaryZoomLevel(process_id, view_id, temp_zoom_level); host_zoom_map->SetTemporaryZoomLevel(process_id, view_id, temp_zoom_level);
EXPECT_DOUBLE_EQ(temp_zoom_level, host_zoom_map->GetZoomLevelForView( EXPECT_DOUBLE_EQ(temp_zoom_level, host_zoom_map->GetZoomLevel(web_contents));
url, process_id, view_id));
// Clear the temporary zoom level in case subsequent test calls use the same // Clear the temporary zoom level in case subsequent test calls use the same
// web_contents. // web_contents.
host_zoom_map->ClearTemporaryZoomLevel(process_id, view_id); host_zoom_map->ClearTemporaryZoomLevel(process_id, view_id);
} }
// Test to make sure that GetZoomForView() works properly for zoom levels // Test to make sure that GetZoomLevel() works properly for zoom levels
// stored by host value, and can distinguish temporary zoom levels from // stored by host value, and can distinguish temporary zoom levels from
// these. // these.
IN_PROC_BROWSER_TEST_F(HostZoomMapImplBrowserTest, GetZoomForView_Host) { IN_PROC_BROWSER_TEST_F(HostZoomMapImplBrowserTest, GetZoomForView_Host) {
...@@ -72,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(HostZoomMapImplBrowserTest, GetZoomForView_Host) { ...@@ -72,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(HostZoomMapImplBrowserTest, GetZoomForView_Host) {
RunTestForURL(url, shell(), host_zoom_level, temp_zoom_level); RunTestForURL(url, shell(), host_zoom_level, temp_zoom_level);
} }
// Test to make sure that GetZoomForView() works properly for zoom levels // Test to make sure that GetZoomLevel() works properly for zoom levels
// stored by host and scheme values, and can distinguish temporary zoom levels // stored by host and scheme values, and can distinguish temporary zoom levels
// from these. // from these.
IN_PROC_BROWSER_TEST_F(HostZoomMapImplBrowserTest, IN_PROC_BROWSER_TEST_F(HostZoomMapImplBrowserTest,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment