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

Side by Side Diff: services/ui/ws/platform_display.cc

Issue 2281583003: services/ui: Split GpuServiceInternal into gpu vs. ws pieces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DONE_2016.08.24_mus-ws-gpu-refactor
Patch Set: tot merge 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
« no previous file with comments | « services/ui/ws/platform_display.h ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "services/ui/ws/platform_display.h" 5 #include "services/ui/ws/platform_display.h"
6 6
7 #include "base/numerics/safe_conversions.h" 7 #include "base/numerics/safe_conversions.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "cc/ipc/quads.mojom.h" 9 #include "cc/ipc/quads.mojom.h"
10 #include "cc/output/copy_output_request.h" 10 #include "cc/output/copy_output_request.h"
11 #include "cc/output/delegated_frame_data.h" 11 #include "cc/output/delegated_frame_data.h"
12 #include "gpu/ipc/client/gpu_channel_host.h"
12 #include "services/shell/public/cpp/connection.h" 13 #include "services/shell/public/cpp/connection.h"
13 #include "services/shell/public/cpp/connector.h" 14 #include "services/shell/public/cpp/connector.h"
14 #include "services/ui/surfaces/display_compositor.h" 15 #include "services/ui/surfaces/display_compositor.h"
15 #include "services/ui/surfaces/surfaces_state.h" 16 #include "services/ui/surfaces/surfaces_state.h"
16 #include "services/ui/ws/platform_display_factory.h" 17 #include "services/ui/ws/platform_display_factory.h"
17 #include "services/ui/ws/platform_display_init_params.h" 18 #include "services/ui/ws/platform_display_init_params.h"
18 #include "services/ui/ws/server_window.h" 19 #include "services/ui/ws/server_window.h"
19 #include "services/ui/ws/window_coordinate_conversions.h" 20 #include "services/ui/ws/window_coordinate_conversions.h"
20 #include "third_party/skia/include/core/SkXfermode.h" 21 #include "third_party/skia/include/core/SkXfermode.h"
21 #include "ui/base/cursor/cursor_loader.h" 22 #include "ui/base/cursor/cursor_loader.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 } 165 }
165 166
166 gfx::Rect DefaultPlatformDisplay::GetBounds() const { 167 gfx::Rect DefaultPlatformDisplay::GetBounds() const {
167 return metrics_.bounds; 168 return metrics_.bounds;
168 } 169 }
169 170
170 bool DefaultPlatformDisplay::IsPrimaryDisplay() const { 171 bool DefaultPlatformDisplay::IsPrimaryDisplay() const {
171 return platform_screen_->GetPrimaryDisplayId() == id_; 172 return platform_screen_->GetPrimaryDisplayId() == id_;
172 } 173 }
173 174
175 void DefaultPlatformDisplay::OnGpuChannelEstablished(
176 scoped_refptr<gpu::GpuChannelHost> channel) {
177 frame_generator_->OnGpuChannelEstablished(channel);
178 }
179
174 void DefaultPlatformDisplay::UpdateMetrics(const gfx::Rect& bounds, 180 void DefaultPlatformDisplay::UpdateMetrics(const gfx::Rect& bounds,
175 float device_scale_factor) { 181 float device_scale_factor) {
176 if (display::Display::HasForceDeviceScaleFactor()) 182 if (display::Display::HasForceDeviceScaleFactor())
177 device_scale_factor = display::Display::GetForcedDeviceScaleFactor(); 183 device_scale_factor = display::Display::GetForcedDeviceScaleFactor();
178 184
179 // We don't care about the origin of the platform window, as that may not be 185 // We don't care about the origin of the platform window, as that may not be
180 // related to the origin of the display in our screen space. 186 // related to the origin of the display in our screen space.
181 if (metrics_.bounds.size() == bounds.size() && 187 if (metrics_.bounds.size() == bounds.size() &&
182 metrics_.device_scale_factor == device_scale_factor) 188 metrics_.device_scale_factor == device_scale_factor)
183 return; 189 return;
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 return delegate_ ? delegate_->IsInHighContrastMode() : false; 301 return delegate_ ? delegate_->IsInHighContrastMode() : false;
296 } 302 }
297 303
298 const ViewportMetrics& DefaultPlatformDisplay::GetViewportMetrics() { 304 const ViewportMetrics& DefaultPlatformDisplay::GetViewportMetrics() {
299 return metrics_; 305 return metrics_;
300 } 306 }
301 307
302 } // namespace ws 308 } // namespace ws
303 309
304 } // namespace ui 310 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/platform_display.h ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698