diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 00:53:19 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 00:53:19 +0000 |
| commit | 468ac5834a17ec9d8a76dea48162a5fe750c633c (patch) | |
| tree | bbd3dd1684c201a9f8c3538e1370668291f98340 /content/browser/renderer_host | |
| parent | fa0dde7d2359d6ec94e88527734dd3da27c38980 (diff) | |
| download | chromium_src-468ac5834a17ec9d8a76dea48162a5fe750c633c.zip chromium_src-468ac5834a17ec9d8a76dea48162a5fe750c633c.tar.gz chromium_src-468ac5834a17ec9d8a76dea48162a5fe750c633c.tar.bz2 | |
Consolidate SetDeviceScaleFactor into ScreenInfoChanged
R=thakis@chromium.org
BUG=155213
TEST=none
Review URL: https://codereview.chromium.org/11413045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
4 files changed, 3 insertions, 16 deletions
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 51dd360..d5d732b 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -1190,17 +1190,6 @@ void RenderWidgetHostImpl::NotifyScreenInfoChanged() { Send(new ViewMsg_ScreenInfoChanged(GetRoutingID(), screen_info)); } -void RenderWidgetHostImpl::SetDeviceScaleFactor(float scale) { -#if defined(USE_AURA) - // Send secreen info as well because JavaScript API |window.open| - // uses screen info to determine the scale factor (crbug.com/155201). - // TODO(oshima|thakis): Consolidate SetDeviceScaleFactor and - // ScreenInfoChanged. crbug.com/155213. - NotifyScreenInfoChanged(); -#endif - Send(new ViewMsg_SetDeviceScaleFactor(GetRoutingID(), scale)); -} - void RenderWidgetHostImpl::UpdateVSyncParameters(base::TimeTicks timebase, base::TimeDelta interval) { Send(new ViewMsg_UpdateVSyncParameters(GetRoutingID(), timebase, interval)); diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index 758fec8..0e00727 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -136,10 +136,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl : virtual public RenderWidgetHost, virtual void WasResized() OVERRIDE; virtual void AddKeyboardListener(KeyboardListener* listener) OVERRIDE; virtual void RemoveKeyboardListener(KeyboardListener* listener) OVERRIDE; - virtual void SetDeviceScaleFactor(float scale) OVERRIDE; // Notification that the screen info has changed. - virtual void NotifyScreenInfoChanged(); + void NotifyScreenInfoChanged(); // Sets the View of this RenderWidgetHost. void SetView(RenderWidgetHostView* view); diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 4a04d3ab..9af6457 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -1431,7 +1431,7 @@ void RenderWidgetHostViewAura::OnDeviceScaleFactorChanged( backing_store->ScaleFactorChanged(device_scale_factor); UpdateScreenInfo(window_); - host_->SetDeviceScaleFactor(device_scale_factor); + host_->NotifyScreenInfoChanged(); current_cursor_.SetScaleFactor(device_scale_factor); } 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 537985a..fb8db75 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -2181,8 +2181,7 @@ void RenderWidgetHostViewMac::SetTextInputActive(bool active) { if (backingStore) // NULL in hardware path. backingStore->ScaleFactorChanged(scaleFactor); - renderWidgetHostView_->render_widget_host_->SetDeviceScaleFactor( - scaleFactor); + renderWidgetHostView_->render_widget_host_->NotifyScreenInfoChanged(); } // http://developer.apple.com/library/mac/#documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/CapturingScreenContents/CapturingScreenContents.html#//apple_ref/doc/uid/TP40012302-CH10-SW4 |