Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.cc

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 211
212 void RenderWidgetHostViewChildFrame::SetBackgroundColor(SkColor color) { 212 void RenderWidgetHostViewChildFrame::SetBackgroundColor(SkColor color) {
213 RenderWidgetHostViewBase::SetBackgroundColor(color); 213 RenderWidgetHostViewBase::SetBackgroundColor(color);
214 bool opaque = GetBackgroundOpaque(); 214 bool opaque = GetBackgroundOpaque();
215 host_->SetBackgroundOpaque(opaque); 215 host_->SetBackgroundOpaque(opaque);
216 } 216 }
217 217
218 gfx::Size RenderWidgetHostViewChildFrame::GetPhysicalBackingSize() const { 218 gfx::Size RenderWidgetHostViewChildFrame::GetPhysicalBackingSize() const {
219 gfx::Size size; 219 gfx::Size size;
220 if (frame_connector_) { 220 if (frame_connector_) {
221 blink::WebScreenInfo screen_info; 221 content::ScreenInfo screen_info;
222 host_->GetWebScreenInfo(&screen_info); 222 host_->GetScreenInfo(&screen_info);
223 size = gfx::ScaleToCeiledSize(frame_connector_->ChildFrameRect().size(), 223 size = gfx::ScaleToCeiledSize(frame_connector_->ChildFrameRect().size(),
224 screen_info.deviceScaleFactor); 224 screen_info.device_scale_factor);
225 } 225 }
226 return size; 226 return size;
227 } 227 }
228 228
229 void RenderWidgetHostViewChildFrame::InitAsPopup( 229 void RenderWidgetHostViewChildFrame::InitAsPopup(
230 RenderWidgetHostView* parent_host_view, 230 RenderWidgetHostView* parent_host_view,
231 const gfx::Rect& bounds) { 231 const gfx::Rect& bounds) {
232 NOTREACHED(); 232 NOTREACHED();
233 } 233 }
234 234
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 709
710 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const { 710 bool RenderWidgetHostViewChildFrame::IsChildFrameForTesting() const {
711 return true; 711 return true;
712 } 712 }
713 713
714 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const { 714 cc::SurfaceId RenderWidgetHostViewChildFrame::SurfaceIdForTesting() const {
715 return surface_id_; 715 return surface_id_;
716 }; 716 };
717 717
718 } // namespace content 718 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698