Change blink::WebScreenInfo to content::ScreenInfo

content/browser/renderer_host/render_widget_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 
 #include <set>
 #include <tuple>
@@ skipping 577 matching lines @@
   // TODO: ideally ViewMsg_WasShown would take a size. This way, the renderer
   // could handle both the restore and resize at once. This isn't that big a
   // deal as RenderWidget::WasShown delays updating, so that the resize from
   // WasResized is usually processed before the renderer is painted.
   WasResized();
 }
 
 bool RenderWidgetHostImpl::GetResizeParams(ResizeParams* resize_params) {
   *resize_params = ResizeParams();
 
-  GetWebScreenInfo(&resize_params->screen_info);
+  GetScreenInfo(&resize_params->screen_info);
   if (delegate_) {
     resize_params->resizer_rect = delegate_->GetRootWindowResizerRect(this);
     resize_params->is_fullscreen_granted =
         delegate_->IsFullscreenForCurrentTab();
     resize_params->display_mode = delegate_->GetDisplayMode(this);
   } else {
     resize_params->is_fullscreen_granted = false;
     resize_params->display_mode = blink::WebDisplayModeBrowser;
   }
 
@@ skipping 629 matching lines @@
     RenderWidgetHost::InputEventObserver* observer) {
   if (!input_event_observers_.HasObserver(observer))
     input_event_observers_.AddObserver(observer);
 }
 
 void RenderWidgetHostImpl::RemoveInputEventObserver(
     RenderWidgetHost::InputEventObserver* observer) {
   input_event_observers_.RemoveObserver(observer);
 }
 
-void RenderWidgetHostImpl::GetWebScreenInfo(blink::WebScreenInfo* result) {
-  TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::GetWebScreenInfo");
+void RenderWidgetHostImpl::GetScreenInfo(ScreenInfo* result) {
+  TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::GetScreenInfo");
   if (delegate_)
     delegate_->GetScreenInfo(result);
   else
     NOTREACHED();
 
   // TODO(sievers): find a way to make this done another way so the method
   // can be const.
-  latency_tracker_.set_device_scale_factor(result->deviceScaleFactor);
+  latency_tracker_.set_device_scale_factor(result->device_scale_factor);
   if (IsUseZoomForDSFEnabled())
-    input_router_->SetDeviceScaleFactor(result->deviceScaleFactor);
+    input_router_->SetDeviceScaleFactor(result->device_scale_factor);
 }
 
 void RenderWidgetHostImpl::HandleCompositorProto(
     const std::vector<uint8_t>& proto) {
   DCHECK(!proto.empty());
   Send(new ViewMsg_HandleCompositorProto(GetRoutingID(), proto));
 }
 
 void RenderWidgetHostImpl::NotifyScreenInfoChanged() {
   if (delegate_)
@@ skipping 938 matching lines @@
   return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL;
 }
 
 BrowserAccessibilityManager*
     RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() {
   return delegate_ ?
       delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL;
 }
 
 }  // namespace content