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

Unified Diff: services/ui/ws/test_utils.cc

Issue 2434923002: Handle modified displays in mustash. (Closed)
Patch Set: Fixes after initial review. Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: services/ui/ws/test_utils.cc
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc
index f5b9ea86f78f618d0c6fc3bfe3ecc15ab539671e..3f9195c791fb9a75392f4e18991cdfc7a8d253c8 100644
--- a/services/ui/ws/test_utils.cc
+++ b/services/ui/ws/test_utils.cc
@@ -54,24 +54,27 @@ class TestPlatformDisplay : public PlatformDisplay {
void SetCursorById(mojom::Cursor cursor) override {
*cursor_storage_ = cursor;
}
- display::Display::Rotation GetRotation() override {
- return display::Display::Rotation::ROTATE_0;
- }
- float GetDeviceScaleFactor() override {
- return display_metrics_.device_scale_factor;
- }
void UpdateTextInputState(const ui::TextInputState& state) override {}
void SetImeVisibility(bool visible) override {}
bool IsFramePending() const override { return false; }
void RequestCopyOfOutput(
std::unique_ptr<cc::CopyOutputRequest> output_request) override {}
gfx::Rect GetBounds() const override { return display_metrics_.bounds; }
+ bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override {
+ if (display_metrics_ == metrics)
+ return false;
+ display_metrics_ = metrics;
+ return true;
+ }
+ const display::ViewportMetrics& GetViewportMetrics() const override {
+ return display_metrics_;
+ }
bool IsPrimaryDisplay() const override { return is_primary_; }
void OnGpuChannelEstablished(
scoped_refptr<gpu::GpuChannelHost> host) override {}
private:
- ViewportMetrics display_metrics_;
+ display::ViewportMetrics display_metrics_;
int64_t id_;
bool is_primary_;
@@ -144,7 +147,8 @@ bool TestFrameGeneratorDelegate::IsInHighContrastMode() {
return false;
}
-const ViewportMetrics& TestFrameGeneratorDelegate::GetViewportMetrics() {
+const display::ViewportMetrics& TestFrameGeneratorDelegate::GetViewportMetrics()
+ const {
return metrics_;
}

Powered by Google App Engine
This is Rietveld 408576698