| Index: content/browser/renderer_host/render_widget_host_view_mac.mm
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| index dbd387441210ac256eb003eb4ae88f1f1ec8638a..b0ce348ae26918c1818e97c50fbad2443cb32450 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| @@ -532,10 +532,14 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
|
| delegated_frame_host_.reset(new DelegatedFrameHost(this));
|
| }
|
|
|
| + gfx::Screen::GetScreenFor(cocoa_view_)->AddObserver(this);
|
| +
|
| render_widget_host_->SetView(this);
|
| }
|
|
|
| RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
|
| + gfx::Screen::GetScreenFor(cocoa_view_)->RemoveObserver(this);
|
| +
|
| // This is being called from |cocoa_view_|'s destructor, so invalidate the
|
| // pointer.
|
| cocoa_view_ = nil;
|
| @@ -2306,6 +2310,24 @@ void RenderWidgetHostViewMac::AcceleratedLayerDidDrawFrame(bool succeeded) {
|
| GotAcceleratedCompositingError();
|
| }
|
|
|
| +////////////////////////////////////////////////////////////////////////////////
|
| +// gfx::DisplayObserver, public:
|
| +
|
| +void RenderWidgetHostViewMac::OnDisplayAdded(const gfx::Display& display) {
|
| +}
|
| +
|
| +void RenderWidgetHostViewMac::OnDisplayRemoved(const gfx::Display& display) {
|
| +}
|
| +
|
| +void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
|
| + const gfx::Display& display, uint32_t metrics) {
|
| + gfx::Screen* screen = gfx::Screen::GetScreenFor(cocoa_view_);
|
| + if (display.id() != screen->GetDisplayNearestWindow(cocoa_view_).id())
|
| + return;
|
| +
|
| + UpdateScreenInfo(cocoa_view_);
|
| +}
|
| +
|
| } // namespace content
|
|
|
| // RenderWidgetHostViewCocoa ---------------------------------------------------
|
|
|