| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index 6ab8b3794e80c5111b99acb545eef2764214b630..3d773bcb468f68c1873b8e0b3816983fb2ec171b 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -23,6 +23,7 @@
|
| #include "build/build_config.h"
|
| #include "content/common/accessibility_mode_enums.h"
|
| #include "content/common/frame_message_enums.h"
|
| +#include "content/common/frame_service.mojom.h"
|
| #include "content/common/mojo/service_registry_impl.h"
|
| #include "content/public/common/console_message_level.h"
|
| #include "content/public/common/javascript_message_type.h"
|
| @@ -691,6 +692,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
| FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate);
|
| FRIEND_TEST_ALL_PREFIXES(RendererAccessibilityTest,
|
| AccessibilityMessagesQueueWhileSwappedOut);
|
| + FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest, ZoomLimit);
|
|
|
| // A wrapper class used as the callback for JavaScript executed
|
| // in an isolated world.
|
| @@ -1014,6 +1016,8 @@ class CONTENT_EXPORT RenderFrameImpl
|
|
|
| void InitializeBlameContext(RenderFrameImpl* parent_frame);
|
|
|
| + void OnGotZoomLevel(const GURL& url, double zoom_level);
|
| +
|
| // Stores the WebLocalFrame we are associated with. This is null from the
|
| // constructor until BindToWebFrame is called, and it is null after
|
| // frameDetached is called until destruction (which is asynchronous in the
|
| @@ -1210,6 +1214,9 @@ class CONTENT_EXPORT RenderFrameImpl
|
|
|
| std::unique_ptr<blink::WebBluetooth> bluetooth_;
|
|
|
| + HostZoomLevels host_zoom_levels_;
|
| + mojom::FrameServicePtr frame_service_;
|
| +
|
| // Manages play, pause notifications for WebMediaPlayer implementations; its
|
| // lifetime is tied to the RenderFrame via the RenderFrameObserver interface.
|
| media::RendererWebMediaPlayerDelegate* media_player_delegate_;
|
|
|