| OLD | NEW |
| 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" |
| 11 #include "mojo/converters/input_events/mojo_extended_key_event_data.h" | 11 #include "mojo/converters/input_events/mojo_extended_key_event_data.h" |
| 12 #include "ui/events/event.h" | 12 #include "ui/events/event.h" |
| 13 #include "ui/events/event_utils.h" | 13 #include "ui/events/event_utils.h" |
| 14 #include "ui/events/platform/platform_event_dispatcher.h" | 14 #include "ui/events/platform/platform_event_dispatcher.h" |
| 15 #include "ui/events/platform/platform_event_source.h" | |
| 16 #include "ui/gfx/geometry/rect.h" | 15 #include "ui/gfx/geometry/rect.h" |
| 17 #include "ui/platform_window/platform_window.h" | 16 #include "ui/platform_window/platform_window.h" |
| 18 #include "ui/platform_window/platform_window_delegate.h" | 17 #include "ui/platform_window/platform_window_delegate.h" |
| 19 #include "ui/platform_window/x11/x11_window.h" | 18 #include "ui/platform_window/x11/x11_window.h" |
| 20 | 19 |
| 21 namespace native_viewport { | 20 namespace native_viewport { |
| 22 namespace { | 21 namespace { |
| 23 | 22 |
| 24 float ConvertUIWheelValueToMojoValue(int offset) { | 23 float ConvertUIWheelValueToMojoValue(int offset) { |
| 25 // Mojo's event type takes a value between -1 and 1. Normalize by allowing | 24 // Mojo's event type takes a value between -1 and 1. Normalize by allowing |
| (...skipping 12 matching lines...) Expand all Loading... |
| 38 } | 37 } |
| 39 | 38 |
| 40 ~PlatformViewportX11() override { | 39 ~PlatformViewportX11() override { |
| 41 // Destroy the platform-window while |this| is still alive. | 40 // Destroy the platform-window while |this| is still alive. |
| 42 platform_window_.reset(); | 41 platform_window_.reset(); |
| 43 } | 42 } |
| 44 | 43 |
| 45 private: | 44 private: |
| 46 // Overridden from PlatformViewport: | 45 // Overridden from PlatformViewport: |
| 47 void Init(const gfx::Rect& bounds) override { | 46 void Init(const gfx::Rect& bounds) override { |
| 48 CHECK(!event_source_); | |
| 49 CHECK(!platform_window_); | 47 CHECK(!platform_window_); |
| 50 | 48 |
| 51 event_source_ = ui::PlatformEventSource::CreateDefault(); | |
| 52 | |
| 53 metrics_ = mojo::ViewportMetrics::New(); | 49 metrics_ = mojo::ViewportMetrics::New(); |
| 54 // TODO(sky): make density real. | 50 // TODO(sky): make density real. |
| 55 metrics_->device_pixel_ratio = 1.f; | 51 metrics_->device_pixel_ratio = 1.f; |
| 56 metrics_->size = mojo::Size::From(bounds.size()); | 52 metrics_->size = mojo::Size::From(bounds.size()); |
| 57 | 53 |
| 58 platform_window_.reset(new ui::X11Window(this)); | 54 platform_window_.reset(new ui::X11Window(this)); |
| 59 platform_window_->SetBounds(bounds); | 55 platform_window_->SetBounds(bounds); |
| 60 } | 56 } |
| 61 | 57 |
| 62 void Show() override { platform_window_->Show(); } | 58 void Show() override { platform_window_->Show(); } |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 143 |
| 148 void OnLostCapture() override {} | 144 void OnLostCapture() override {} |
| 149 | 145 |
| 150 void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override { | 146 void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override { |
| 151 delegate_->OnAcceleratedWidgetAvailable(widget, | 147 delegate_->OnAcceleratedWidgetAvailable(widget, |
| 152 metrics_->device_pixel_ratio); | 148 metrics_->device_pixel_ratio); |
| 153 } | 149 } |
| 154 | 150 |
| 155 void OnActivationChanged(bool active) override {} | 151 void OnActivationChanged(bool active) override {} |
| 156 | 152 |
| 157 scoped_ptr<ui::PlatformEventSource> event_source_; | |
| 158 scoped_ptr<ui::PlatformWindow> platform_window_; | 153 scoped_ptr<ui::PlatformWindow> platform_window_; |
| 159 Delegate* delegate_; | 154 Delegate* delegate_; |
| 160 mojo::ViewportMetricsPtr metrics_; | 155 mojo::ViewportMetricsPtr metrics_; |
| 161 | 156 |
| 162 DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11); | 157 DISALLOW_COPY_AND_ASSIGN(PlatformViewportX11); |
| 163 }; | 158 }; |
| 164 | 159 |
| 165 // static | 160 // static |
| 166 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) { | 161 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) { |
| 167 return make_scoped_ptr(new PlatformViewportX11(delegate)); | 162 return make_scoped_ptr(new PlatformViewportX11(delegate)); |
| 168 } | 163 } |
| 169 | 164 |
| 170 } // namespace native_viewport | 165 } // namespace native_viewport |
| OLD | NEW |