mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

map webframe zoom api to use HostZoomMap

Browse source
This commit is contained in:
deepak1556 2017-01-30 22:36:50 +05:30
parent 63c0e4cbb1
commit e3fe3cc490
9 changed files with 113 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

44
atom/browser/web_contents_zoom_controller.cc
View file

@ -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.