Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1423)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1964273002: Add FrameHost mojo service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android-2 Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index d45cdaae73337a466a57500d384aa5f935f24aee..13f8928e57d98159fe65dfb68fcc72fdb1944894 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1146,6 +1146,10 @@ void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) {
blame_context_->Initialize();
}
+void RenderFrameImpl::OnGotZoomLevel(const GURL& url, double zoom_level) {
+ host_zoom_levels_[url] = zoom_level;
+}
+
RenderWidget* RenderFrameImpl::GetRenderWidget() {
RenderFrameImpl* local_root =
RenderFrameImpl::FromWebFrame(frame_->localRoot());
@@ -3900,6 +3904,16 @@ void RenderFrameImpl::willSendRequest(
if (!render_view_->renderer_preferences_.enable_referrers)
request.setHTTPReferrer(WebString(), blink::WebReferrerPolicyDefault);
+
+ if (extra_data->is_main_frame()) {
+ if (!host_zoom_level_.is_bound()) {
+ RenderThread::Get()->GetServiceRegistry()->ConnectToRemoteService(
+ mojo::GetProxy(&host_zoom_level_));
+ }
+ host_zoom_level_->GetZoomLevel(request_url, render_view_->GetRoutingID(),
+ base::Bind(&RenderFrameImpl::OnGotZoomLevel,
+ weak_factory_.GetWeakPtr()));
+ }
}
void RenderFrameImpl::didReceiveResponse(
@@ -4495,7 +4509,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(
// Set zoom level, but don't do it for full-page plugin since they don't use
// the same zoom settings.
HostZoomLevels::iterator host_zoom =
- render_view_->host_zoom_levels_.find(GURL(request.url()));
+ host_zoom_levels_.find(GURL(request.url()));
if (render_view_->webview()->mainFrame()->isWebLocalFrame() &&
render_view_->webview()->mainFrame()->document().isPluginDocument()) {
// Reset the zoom levels for plugins.
@@ -4503,15 +4517,15 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(
} else {
// If the zoom level is not found, then do nothing. In-page navigation
// relies on not changing the zoom level in this case.
- if (host_zoom != render_view_->host_zoom_levels_.end())
+ if (host_zoom != host_zoom_levels_.end())
render_view_->SetZoomLevel(host_zoom->second);
}
- if (host_zoom != render_view_->host_zoom_levels_.end()) {
+ if (host_zoom != host_zoom_levels_.end()) {
// This zoom level was merely recorded transiently for this load. We can
// erase it now. If at some point we reload this page, the browser will
// send us a new, up-to-date zoom level.
- render_view_->host_zoom_levels_.erase(host_zoom);
+ host_zoom_levels_.erase(host_zoom);
}
// Update contents MIME type for main frame.

Powered by Google App Engine
This is Rietveld 408576698