Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index ec984c09e5015650b53d8ee6fc19645de14ec85b..855bbca61b23d969318c8fcfc06bbeaac0d6a470 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -946,6 +946,13 @@ RenderViewImpl* RenderViewImpl::Create( |
render_view = new RenderViewImpl(¶ms); |
render_view->Initialize(¶ms); |
+ // For now, don't remember plugin zoom values. We don't want to mix them with |
+ // normal web content (i.e. a fixed layout plugin would usually want them |
+ // different). |
+ bool uses_temporary_zoom_level = |
+ render_view->webview()->mainFrame()->document().isPluginDocument(); |
+ render_view->Send(new ViewHostMsg_DidCreateDocument( |
+ render_view->GetRoutingID(), uses_temporary_zoom_level)); |
return render_view; |
} |
@@ -1078,7 +1085,6 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind) |
IPC_MESSAGE_HANDLER(ViewMsg_StopFinding, OnStopFinding) |
IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom) |
- IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevel, OnSetZoomLevel) |
IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingURL, |
OnSetZoomLevelForLoadingURL) |
IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding) |
@@ -2678,12 +2684,6 @@ void RenderViewImpl::OnZoom(PageZoom zoom) { |
zoomLevelChanged(); |
} |
-void RenderViewImpl::OnSetZoomLevel(double zoom_level) { |
- webview()->hidePopups(); |
- webview()->setZoomLevel(zoom_level); |
- zoomLevelChanged(); |
-} |
- |
void RenderViewImpl::OnSetZoomLevelForLoadingURL(const GURL& url, |
double zoom_level) { |
#if !defined(OS_ANDROID) |
@@ -3676,22 +3676,16 @@ blink::WebSpeechRecognizer* RenderViewImpl::speechRecognizer() { |
void RenderViewImpl::zoomLimitsChanged(double minimum_level, |
double maximum_level) { |
- // For now, don't remember plugin zoom values. We don't want to mix them with |
- // normal web content (i.e. a fixed layout plugin would usually want them |
- // different). |
- bool remember = !webview()->mainFrame()->document().isPluginDocument(); |
- |
int minimum_percent = static_cast<int>( |
ZoomLevelToZoomFactor(minimum_level) * 100); |
int maximum_percent = static_cast<int>( |
ZoomLevelToZoomFactor(maximum_level) * 100); |
Send(new ViewHostMsg_UpdateZoomLimits( |
- routing_id_, minimum_percent, maximum_percent, remember)); |
+ routing_id_, minimum_percent, maximum_percent)); |
} |
void RenderViewImpl::zoomLevelChanged() { |
- bool remember = !webview()->mainFrame()->document().isPluginDocument(); |
double zoom_level = webview()->zoomLevel(); |
FOR_EACH_OBSERVER(RenderViewObserver, observers_, ZoomLevelChanged()); |
@@ -3702,7 +3696,7 @@ void RenderViewImpl::zoomLevelChanged() { |
// Tell the browser which url got zoomed so it can update the menu and the |
// saved values if necessary |
Send(new ViewHostMsg_DidZoomURL( |
- routing_id_, zoom_level, remember, |
+ routing_id_, zoom_level, |
GURL(webview()->mainFrame()->document().url()))); |
} |
} |