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

Side by Side Diff: components/native_viewport/platform_viewport_x11.cc

Issue 1136743003: Plumbs through screen size and scale factor to html_viewer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "components/native_viewport/platform_viewport.h" 5 #include "components/native_viewport/platform_viewport.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "mojo/converters/geometry/geometry_type_converters.h" 9 #include "mojo/converters/geometry/geometry_type_converters.h"
10 #include "mojo/converters/input_events/input_events_type_converters.h" 10 #include "mojo/converters/input_events/input_events_type_converters.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 private: 45 private:
46 // Overridden from PlatformViewport: 46 // Overridden from PlatformViewport:
47 void Init(const gfx::Rect& bounds) override { 47 void Init(const gfx::Rect& bounds) override {
48 CHECK(!event_source_); 48 CHECK(!event_source_);
49 CHECK(!platform_window_); 49 CHECK(!platform_window_);
50 50
51 event_source_ = ui::PlatformEventSource::CreateDefault(); 51 event_source_ = ui::PlatformEventSource::CreateDefault();
52 52
53 metrics_ = mojo::ViewportMetrics::New(); 53 metrics_ = mojo::ViewportMetrics::New();
54 // TODO(sky): make density real.
55 metrics_->device_pixel_ratio = 1.f;
54 metrics_->size = mojo::Size::From(bounds.size()); 56 metrics_->size = mojo::Size::From(bounds.size());
55 57
56 platform_window_.reset(new ui::X11Window(this)); 58 platform_window_.reset(new ui::X11Window(this));
57 platform_window_->SetBounds(bounds); 59 platform_window_->SetBounds(bounds);
58 } 60 }
59 61
60 void Show() override { platform_window_->Show(); } 62 void Show() override { platform_window_->Show(); }
61 63
62 void Hide() override { platform_window_->Hide(); } 64 void Hide() override { platform_window_->Hide(); }
63 65
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 141
140 void OnCloseRequest() override { platform_window_->Close(); } 142 void OnCloseRequest() override { platform_window_->Close(); }
141 143
142 void OnClosed() override { delegate_->OnDestroyed(); } 144 void OnClosed() override { delegate_->OnDestroyed(); }
143 145
144 void OnWindowStateChanged(ui::PlatformWindowState state) override {} 146 void OnWindowStateChanged(ui::PlatformWindowState state) override {}
145 147
146 void OnLostCapture() override {} 148 void OnLostCapture() override {}
147 149
148 void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override { 150 void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override {
149 delegate_->OnAcceleratedWidgetAvailable(widget); 151 delegate_->OnAcceleratedWidgetAvailable(widget,
152 metrics_->device_pixel_ratio);
150 } 153 }
151 154
152 void OnActivationChanged(bool active) override {} 155 void OnActivationChanged(bool active) override {}
153 156
154 scoped_ptr<ui::PlatformEventSource> event_source_; 157 scoped_ptr<ui::PlatformEventSource> event_source_;
155 scoped_ptr<ui::PlatformWindow> platform_window_; 158 scoped_ptr<ui::PlatformWindow> platform_window_;
156 Delegate* delegate_; 159 Delegate* delegate_;
157 mojo::ViewportMetricsPtr metrics_; 160 mojo::ViewportMetricsPtr metrics_;
158 161
159 DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11); 162 DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11);
160 }; 163 };
161 164
162 // static 165 // static
163 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) { 166 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) {
164 return make_scoped_ptr(new PlatformViewportX11(delegate)); 167 return make_scoped_ptr(new PlatformViewportX11(delegate));
165 } 168 }
166 169
167 } // namespace native_viewport 170 } // namespace native_viewport
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698