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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1804023002: Fix page zoom to be frame-centric for out-of-process frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address alexmos@ comments, run two experiments. Created 4 years, 8 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/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 552dfb6fe864364b1037c41c7e7b4b9c90685e37..42c4cdeff297d360bfb2e3e07a60dec4bca8328d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -112,6 +112,7 @@
#include "content/public/common/web_preferences.h"
#include "mojo/common/url_type_converters.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
+#include "net/base/url_util.h"
#include "net/http/http_cache.h"
#include "net/http/http_transaction_factory.h"
#include "net/url_request/url_request_context.h"
@@ -859,6 +860,33 @@ void WebContentsImpl::RequestAXTreeSnapshot(AXTreeSnapshotCallback callback) {
GetMainFrame()->RequestAXTreeSnapshot(callback);
}
+void WebContentsImpl::SetTemporaryZoomLevel(double level, bool is_temporary) {
+ SendToAllFrames(new FrameMsg_SetTemporaryZoomLevel(MSG_ROUTING_NONE, level,
+ is_temporary));
+}
+
+void WebContentsImpl::UpdateZoom(double level) {
+ // Individual frames may still ignore the new zoom level if their RenderView
+ // contains a plugin document or if it uses a temporary zoom level.
+ SendToAllFrames(new FrameMsg_SetPageZoomLevel(MSG_ROUTING_NONE, level));
+}
+
+void WebContentsImpl::UpdateZoomIfNecessary(const std::string& scheme,
+ const std::string& host,
+ double level) {
+ NavigationEntry* entry = GetController().GetLastCommittedEntry();
+ if (!entry)
+ return;
+
+ GURL url = HostZoomMap::GetURLFromEntry(entry);
+ if (host != net::GetHostOrSpecFromURL(url) ||
+ (!scheme.empty() && scheme != url.scheme())) {
+ return;
+ }
+
+ UpdateZoom(level);
+}
+
WebUI* WebContentsImpl::CreateSubframeWebUI(const GURL& url,
const std::string& frame_name) {
DCHECK(!frame_name.empty());

Powered by Google App Engine
This is Rietveld 408576698