map webframe zoom api to use HostZoomMap
This commit is contained in:
parent
63c0e4cbb1
commit
e3fe3cc490
9 changed files with 113 additions and 18 deletions
|
@ -819,6 +819,10 @@ bool WebContents::OnMessageReceived(const IPC::Message& message) {
|
|||
IPC_MESSAGE_HANDLER(AtomViewHostMsg_Message, OnRendererMessage)
|
||||
IPC_MESSAGE_HANDLER_DELAY_REPLY(AtomViewHostMsg_Message_Sync,
|
||||
OnRendererMessageSync)
|
||||
IPC_MESSAGE_HANDLER_DELAY_REPLY(AtomViewHostMsg_SetTemporaryZoomLevel,
|
||||
OnSetTemporaryZoomLevel)
|
||||
IPC_MESSAGE_HANDLER_DELAY_REPLY(AtomViewHostMsg_GetZoomLevel,
|
||||
OnGetZoomLevel)
|
||||
IPC_MESSAGE_HANDLER_CODE(ViewHostMsg_SetCursor, OnCursorChange,
|
||||
handled = false)
|
||||
IPC_MESSAGE_UNHANDLED(handled = false)
|
||||
|
@ -1523,6 +1527,19 @@ double WebContents::GetZoomFactor() {
|
|||
return content::ZoomLevelToZoomFactor(level);
|
||||
}
|
||||
|
||||
void WebContents::OnSetTemporaryZoomLevel(double level,
|
||||
IPC::Message* reply_msg) {
|
||||
zoom_controller_->SetTemporaryZoomLevel(level);
|
||||
double new_level = zoom_controller_->GetTemporaryZoomLevel();
|
||||
AtomViewHostMsg_SetTemporaryZoomLevel::WriteReplyParams(reply_msg, new_level);
|
||||
Send(reply_msg);
|
||||
}
|
||||
|
||||
void WebContents::OnGetZoomLevel(IPC::Message* reply_msg) {
|
||||
AtomViewHostMsg_GetZoomLevel::WriteReplyParams(reply_msg, GetZoomLevel());
|
||||
Send(reply_msg);
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
|
||||
WebContentsPreferences* web_preferences =
|
||||
WebContentsPreferences::FromWebContents(web_contents());
|
||||
|
|
|
@ -352,6 +352,14 @@ class WebContents : public mate::TrackableObject<WebContents>,
|
|||
const base::ListValue& args,
|
||||
IPC::Message* message);
|
||||
|
||||
// Called when received a synchronous message from renderer to
|
||||
// set temporary zoom level.
|
||||
void OnSetTemporaryZoomLevel(double level, IPC::Message* reply_msg);
|
||||
|
||||
// Called when received a synchronous message from renderer to
|
||||
// get the zoom level.
|
||||
void OnGetZoomLevel(IPC::Message* reply_msg);
|
||||
|
||||
v8::Global<v8::Value> session_;
|
||||
v8::Global<v8::Value> devtools_web_contents_;
|
||||
v8::Global<v8::Value> debugger_;
|
||||
|
|
|
@ -22,6 +22,7 @@ WebContentsZoomController::WebContentsZoomController(
|
|||
content::WebContents* web_contents)
|
||||
: content::WebContentsObserver(web_contents) {
|
||||
default_zoom_factor_ = content::kEpsilon;
|
||||
temporary_zoom_level_ = content::kEpsilon;
|
||||
host_zoom_map_ = content::HostZoomMap::GetForWebContents(web_contents);
|
||||
zoom_subscription_ = host_zoom_map_->AddZoomLevelChangedCallback(base::Bind(
|
||||
&WebContentsZoomController::OnZoomLevelChanged, base::Unretained(this)));
|
||||
|
@ -43,6 +44,11 @@ void WebContentsZoomController::SetZoomLevel(double level) {
|
|||
if (!web_contents()->GetRenderViewHost()->IsRenderViewLive() ||
|
||||
content::ZoomValuesEqual(GetZoomLevel(), level))
|
||||
return;
|
||||
|
||||
if (!content::ZoomValuesEqual(GetTemporaryZoomLevel(), content::kEpsilon)) {
|
||||
temporary_zoom_level_ = content::kEpsilon;
|
||||
}
|
||||
|
||||
auto new_zoom_factor = content::ZoomLevelToZoomFactor(level);
|
||||
content::NavigationEntry* entry =
|
||||
web_contents()->GetController().GetLastCommittedEntry();
|
||||
|
@ -54,7 +60,7 @@ void WebContentsZoomController::SetZoomLevel(double level) {
|
|||
content::HostZoomMap::SetZoomLevel(web_contents(), level);
|
||||
// Notify observers of zoom level changes.
|
||||
FOR_EACH_OBSERVER(WebContentsZoomController::Observer, observers_,
|
||||
OnZoomLevelChanged(web_contents(), level));
|
||||
OnZoomLevelChanged(web_contents(), level, false));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -70,6 +76,34 @@ double WebContentsZoomController::GetDefaultZoomFactor() {
|
|||
return default_zoom_factor_;
|
||||
}
|
||||
|
||||
bool WebContentsZoomController::UsesTemporaryZoomLevel() {
|
||||
return !content::ZoomValuesEqual(temporary_zoom_level_, content::kEpsilon);
|
||||
}
|
||||
|
||||
double WebContentsZoomController::GetTemporaryZoomLevel() {
|
||||
return temporary_zoom_level_;
|
||||
}
|
||||
|
||||
void WebContentsZoomController::SetTemporaryZoomLevel(double level) {
|
||||
int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
|
||||
int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
|
||||
host_zoom_map_->SetTemporaryZoomLevel(render_process_id, render_view_id,
|
||||
level);
|
||||
temporary_zoom_level_ = level;
|
||||
// Notify observers of zoom level changes.
|
||||
FOR_EACH_OBSERVER(WebContentsZoomController::Observer, observers_,
|
||||
OnZoomLevelChanged(web_contents(), level, true));
|
||||
}
|
||||
|
||||
void WebContentsZoomController::DidStartNavigation(
|
||||
content::NavigationHandle* navigation_handle) {
|
||||
if (!navigation_handle->IsInMainFrame() || navigation_handle->IsSamePage())
|
||||
return;
|
||||
int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
|
||||
int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
|
||||
host_zoom_map_->ClearTemporaryZoomLevel(render_process_id, render_view_id);
|
||||
}
|
||||
|
||||
void WebContentsZoomController::DidFinishNavigation(
|
||||
content::NavigationHandle* navigation_handle) {
|
||||
if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
|
||||
|
@ -108,6 +142,14 @@ void WebContentsZoomController::SetZoomFactorOnNavigationIfNeeded(
|
|||
if (content::ZoomValuesEqual(GetDefaultZoomFactor(), content::kEpsilon))
|
||||
return;
|
||||
|
||||
if (!content::ZoomValuesEqual(GetTemporaryZoomLevel(), content::kEpsilon)) {
|
||||
FOR_EACH_OBSERVER(
|
||||
WebContentsZoomController::Observer, observers_,
|
||||
OnZoomLevelChanged(web_contents(), GetTemporaryZoomLevel(), true));
|
||||
temporary_zoom_level_ = content::kEpsilon;
|
||||
return;
|
||||
}
|
||||
|
||||
// When kZoomFactor is available, it takes precedence over
|
||||
// pref store values but if the host has zoom factor set explicitly
|
||||
// then it takes precendence.
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#ifndef ATOM_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
|
||||
#define ATOM_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include "content/public/browser/host_zoom_map.h"
|
||||
#include "content/public/browser/web_contents_observer.h"
|
||||
#include "content/public/browser/web_contents_user_data.h"
|
||||
|
@ -19,7 +22,8 @@ class WebContentsZoomController
|
|||
class Observer {
|
||||
public:
|
||||
virtual void OnZoomLevelChanged(content::WebContents* web_contents,
|
||||
double level) {}
|
||||
double level,
|
||||
bool is_temporary) {}
|
||||
|
||||
protected:
|
||||
virtual ~Observer() {}
|
||||
|
@ -36,9 +40,13 @@ class WebContentsZoomController
|
|||
double GetZoomLevel();
|
||||
void SetDefaultZoomFactor(double factor);
|
||||
double GetDefaultZoomFactor();
|
||||
void SetTemporaryZoomLevel(double level);
|
||||
bool UsesTemporaryZoomLevel();
|
||||
double GetTemporaryZoomLevel();
|
||||
|
||||
protected:
|
||||
// content::WebContentsObserver:
|
||||
void DidStartNavigation(content::NavigationHandle* handle) override;
|
||||
void DidFinishNavigation(content::NavigationHandle* handle) override;
|
||||
void WebContentsDestroyed() override;
|
||||
void RenderFrameHostChanged(content::RenderFrameHost* old_host,
|
||||
|
@ -55,6 +63,7 @@ class WebContentsZoomController
|
|||
|
||||
// kZoomFactor.
|
||||
double default_zoom_factor_;
|
||||
double temporary_zoom_level_;
|
||||
|
||||
// Map between zoom factor and hosts in this webContent.
|
||||
std::map<std::string, double> host_zoom_factor_;
|
||||
|
|
|
@ -112,6 +112,10 @@ void WebViewGuestDelegate::DidAttach(int guest_proxy_routing_id) {
|
|||
embedder_zoom_controller_ =
|
||||
WebContentsZoomController::FromWebContents(embedder_web_contents_);
|
||||
embedder_zoom_controller_->AddObserver(this);
|
||||
if (embedder_zoom_controller_->UsesTemporaryZoomLevel()) {
|
||||
double level = embedder_zoom_controller_->GetTemporaryZoomLevel();
|
||||
api_web_contents_->GetZoomController()->SetTemporaryZoomLevel(level);
|
||||
}
|
||||
}
|
||||
|
||||
content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() const {
|
||||
|
@ -141,9 +145,14 @@ void WebViewGuestDelegate::WillAttach(
|
|||
|
||||
void WebViewGuestDelegate::OnZoomLevelChanged(
|
||||
content::WebContents* web_contents,
|
||||
double level) {
|
||||
double level,
|
||||
bool is_temporary) {
|
||||
if (web_contents == GetOwnerWebContents()) {
|
||||
api_web_contents_->GetZoomController()->SetZoomLevel(level);
|
||||
if (is_temporary) {
|
||||
api_web_contents_->GetZoomController()->SetTemporaryZoomLevel(level);
|
||||
} else {
|
||||
api_web_contents_->GetZoomController()->SetZoomLevel(level);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -67,7 +67,8 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
|
|||
|
||||
// WebContentsZoomController::Observer:
|
||||
void OnZoomLevelChanged(content::WebContents* web_contents,
|
||||
double level) override;
|
||||
double level,
|
||||
bool is_temporary) override;
|
||||
|
||||
private:
|
||||
// This method is invoked when the contents auto-resized to give the container
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue