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

Side by Side Diff: content/renderer/render_view_impl.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 2940 matching lines...) Expand 10 before | Expand all | Expand 10 after
2951 if (!has_focus()) 2951 if (!has_focus())
2952 return; 2952 return;
2953 OnSetFocus(false); 2953 OnSetFocus(false);
2954 OnSetActive(false); 2954 OnSetActive(false);
2955 } 2955 }
2956 } 2956 }
2957 2957
2958 void RenderViewImpl::SetDeviceScaleFactorForTesting(float factor) { 2958 void RenderViewImpl::SetDeviceScaleFactorForTesting(float factor) {
2959 ResizeParams params; 2959 ResizeParams params;
2960 params.screen_info = screen_info_; 2960 params.screen_info = screen_info_;
2961 params.screen_info.deviceScaleFactor = factor; 2961 params.screen_info.device_scale_factor = factor;
2962 params.new_size = size(); 2962 params.new_size = size();
2963 params.visible_viewport_size = visible_viewport_size_; 2963 params.visible_viewport_size = visible_viewport_size_;
2964 params.physical_backing_size = gfx::ScaleToCeiledSize(size(), factor); 2964 params.physical_backing_size = gfx::ScaleToCeiledSize(size(), factor);
2965 params.top_controls_shrink_blink_size = false; 2965 params.top_controls_shrink_blink_size = false;
2966 params.top_controls_height = 0.f; 2966 params.top_controls_height = 0.f;
2967 params.resizer_rect = WebRect(); 2967 params.resizer_rect = WebRect();
2968 params.is_fullscreen_granted = is_fullscreen_granted(); 2968 params.is_fullscreen_granted = is_fullscreen_granted();
2969 params.display_mode = display_mode_; 2969 params.display_mode = display_mode_;
2970 OnResize(params); 2970 OnResize(params);
2971 } 2971 }
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
3056 return render_frame->focused_pepper_plugin(); 3056 return render_frame->focused_pepper_plugin();
3057 } 3057 }
3058 frame = frame->traverseNext(false); 3058 frame = frame->traverseNext(false);
3059 } 3059 }
3060 3060
3061 return nullptr; 3061 return nullptr;
3062 } 3062 }
3063 #endif 3063 #endif
3064 3064
3065 } // namespace content 3065 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698