0
Files
src/content/browser/host_zoom_map_impl.h
akaba 3483d8fd93 Fix zoom in per-tab mode.
Zoom in per-tab mode was broken after
c6bd1218e8
because RenderWidget::UpdateZoom and RenderViewImpl::UpdateZoomLevel were not updating the
zoom level when temporary zoom level is enabled in both the visual properties and RenderWidget.
This is not the intended behavior and this CL addresses this issue by removing temporary zoom
as part of visual properties and handling temporary zoom settings in the browser side instead.

Bug: 860511
TBR: kenrb@chromium.org
Change-Id: Ic4326438cdec27936fee59d9384a71e7d1e9a238
Reviewed-on: https://chromium-review.googlesource.com/1127465
Commit-Queue: Andre Kaba <akaba@google.com>
Reviewed-by: Charlie Reis <creis@chromium.org>
Reviewed-by: Kevin McNee <mcnee@chromium.org>
Reviewed-by: Fady Samuel <fsamuel@chromium.org>
Reviewed-by: James MacLean <wjmaclean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#573925}
2018-07-10 21:43:09 +00:00

159 lines
6.2 KiB
C++

// Copyright (c) 2012 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 CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_
#define CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_
#include <map>
#include <string>
#include <tuple>
#include <vector>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/sequenced_task_runner_helpers.h"
#include "content/public/browser/host_zoom_map.h"
namespace content {
class WebContentsImpl;
// HostZoomMap lives on the UI thread.
class CONTENT_EXPORT HostZoomMapImpl : public HostZoomMap {
public:
HostZoomMapImpl();
~HostZoomMapImpl() override;
// HostZoomMap implementation:
void SetPageScaleFactorIsOneForView(
int render_process_id, int render_view_id, bool is_one) override;
void ClearPageScaleFactorIsOneForView(
int render_process_id, int render_view_id) override;
void CopyFrom(HostZoomMap* copy) override;
double GetZoomLevelForHostAndScheme(const std::string& scheme,
const std::string& host) const override;
// TODO(wjmaclean) Should we use a GURL here? crbug.com/384486
bool HasZoomLevel(const std::string& scheme,
const std::string& host) const override;
ZoomLevelVector GetAllZoomLevels() const override;
void SetZoomLevelForHost(const std::string& host, double level) override;
void InitializeZoomLevelForHost(const std::string& host,
double level,
base::Time last_modified) override;
void SetZoomLevelForHostAndScheme(const std::string& scheme,
const std::string& host,
double level) override;
bool UsesTemporaryZoomLevel(int render_process_id,
int render_view_id) const override;
void SetTemporaryZoomLevel(int render_process_id,
int render_view_id,
double level) override;
void ClearZoomLevels(base::Time delete_begin, base::Time delete_end) override;
void ClearTemporaryZoomLevel(int render_process_id,
int render_view_id) override;
double GetDefaultZoomLevel() const override;
void SetDefaultZoomLevel(double level) override;
std::unique_ptr<Subscription> AddZoomLevelChangedCallback(
const ZoomLevelChangedCallback& callback) override;
// Returns the current zoom level for the specified WebContents. This may
// be a temporary zoom level, depending on UsesTemporaryZoomLevel().
double GetZoomLevelForWebContents(
const WebContentsImpl& web_contents_impl) const;
bool PageScaleFactorIsOneForWebContents(
const WebContentsImpl& web_contents_impl) const;
// Sets the zoom level for this WebContents. If this WebContents is using
// a temporary zoom level, then level is only applied to this WebContents.
// Otherwise, the level will be applied on a host level.
void SetZoomLevelForWebContents(const WebContentsImpl& web_contents_impl,
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
// the given WebContents (i.e. isn't saved and doesn't affect other
// WebContentses) if it exists, the default zoom level otherwise.
double GetTemporaryZoomLevel(int render_process_id,
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) const;
void SendErrorPageZoomLevelRefresh();
void WillCloseRenderView(int render_process_id, int render_view_id);
void SetClockForTesting(base::Clock* clock) override;
private:
struct ZoomLevel {
double level;
base::Time last_modified;
};
typedef std::map<std::string, ZoomLevel> HostZoomLevels;
typedef std::map<std::string, HostZoomLevels> SchemeHostZoomLevels;
struct RenderViewKey {
int render_process_id;
int render_view_id;
RenderViewKey(int render_process_id, int render_view_id)
: render_process_id(render_process_id),
render_view_id(render_view_id) {}
bool operator<(const RenderViewKey& other) const {
return std::tie(render_process_id, render_view_id) <
std::tie(other.render_process_id, other.render_view_id);
}
};
typedef std::map<RenderViewKey, double> TemporaryZoomLevels;
typedef std::map<RenderViewKey, bool> ViewPageScaleFactorsAreOne;
double GetZoomLevelForHost(const std::string& host) const;
// Set a zoom level for |host| and store the |last_modified| timestamp.
// Use only to explicitly set a timestamp.
void SetZoomLevelForHostInternal(const std::string& host,
double level,
base::Time last_modified);
// Notifies the renderers from this browser context to change the zoom level
// for the specified host and scheme.
// |zoom level| will be extracted from |host_zoom_levels_| when needed, so no
// need to pass them in.
// TODO(wjmaclean) Should we use a GURL here? crbug.com/384486
void SendZoomLevelChange(const std::string& scheme, const std::string& host);
// Callbacks called when zoom level changes.
base::CallbackList<void(const ZoomLevelChange&)>
zoom_level_changed_callbacks_;
// Copy of the pref data.
HostZoomLevels host_zoom_levels_;
SchemeHostZoomLevels scheme_host_zoom_levels_;
double default_zoom_level_;
// Page scale factor data for each renderer.
ViewPageScaleFactorsAreOne view_page_scale_factors_are_one_;
TemporaryZoomLevels temporary_zoom_levels_;
base::Clock* clock_;
DISALLOW_COPY_AND_ASSIGN(HostZoomMapImpl);
};
} // namespace content
#endif // CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_