| Index: content/common/view_messages.h
|
| diff --git a/content/common/view_messages.h b/content/common/view_messages.h
|
| index 9061b502ffc5ea4f99aefa2bbac284d8ed886b2e..44473d5609b9483c3c526462c5dae61873174002 100644
|
| --- a/content/common/view_messages.h
|
| +++ b/content/common/view_messages.h
|
| @@ -669,12 +669,6 @@ IPC_MESSAGE_ROUTED0(ViewMsg_DisownOpener)
|
| IPC_MESSAGE_ROUTED1(ViewMsg_Zoom,
|
| content::PageZoom /* function */)
|
|
|
| -// Set the zoom level for the current main frame. If the level actually
|
| -// changes, a ViewHostMsg_DidZoomURL message will be sent back to the browser
|
| -// telling it what url got zoomed and what its current zoom level is.
|
| -IPC_MESSAGE_ROUTED1(ViewMsg_SetZoomLevel,
|
| - double /* zoom_level */)
|
| -
|
| // Set the zoom level for a particular url that the renderer is in the
|
| // process of loading. This will be stored, to be used if the load commits
|
| // and ignored otherwise.
|
| @@ -1124,7 +1118,8 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_UpdateTargetURL,
|
| // Sent when the document element is available for the top-level frame. This
|
| // happens after the page starts loading, but before all resources are
|
| // finished.
|
| -IPC_MESSAGE_ROUTED0(ViewHostMsg_DocumentAvailableInMainFrame)
|
| +IPC_MESSAGE_ROUTED1(ViewHostMsg_DocumentAvailableInMainFrame,
|
| + bool /* uses temporary zoom settings */)
|
|
|
| // Sent when the renderer loads a resource from its memory cache.
|
| // The security info is non empty if the resource was originally loaded over
|
| @@ -1439,23 +1434,27 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_TextInputStateChanged,
|
| // Required for cancelling an ongoing input method composition.
|
| IPC_MESSAGE_ROUTED0(ViewHostMsg_ImeCancelComposition)
|
|
|
| +// Sent when creating a new main-frame document in the renderer and it turns
|
| +// out to be a plugin document. Contents needs to keep track of this, since
|
| +// zooming is handled differently for plugin documents.
|
| +IPC_MESSAGE_ROUTED1(ViewHostMsg_DidCreateDocument,
|
| + bool /* uses_temporary_zoom_level */)
|
| +
|
| // Sent when the renderer changes the zoom level for a particular url, so the
|
| -// browser can update its records. If remember is true, then url is used to
|
| -// update the zoom level for all pages in that site. Otherwise, the render
|
| -// view's id is used so that only the menu is updated.
|
| -IPC_MESSAGE_ROUTED3(ViewHostMsg_DidZoomURL,
|
| +// browser can update its records. If the view is a plugin doc, then url is
|
| +// used to update the zoom level for all pages in that site. Otherwise, the
|
| +// render view's id is used so that only the menu is updated.
|
| +IPC_MESSAGE_ROUTED2(ViewHostMsg_DidZoomURL,
|
| double /* zoom_level */,
|
| - bool /* remember */,
|
| GURL /* url */)
|
|
|
| // Updates the minimum/maximum allowed zoom percent for this tab from the
|
| // default values. If |remember| is true, then the zoom setting is applied to
|
| // other pages in the site and is saved, otherwise it only applies to this
|
| // tab.
|
| -IPC_MESSAGE_ROUTED3(ViewHostMsg_UpdateZoomLimits,
|
| +IPC_MESSAGE_ROUTED2(ViewHostMsg_UpdateZoomLimits,
|
| int /* minimum_percent */,
|
| - int /* maximum_percent */,
|
| - bool /* remember */)
|
| + int /* maximum_percent */)
|
|
|
| // Notify the browser that this render process can or can't be suddenly
|
| // terminated.
|
|
|