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

Unified Diff: mojo/services/native_viewport/native_viewport_impl.cc

Issue 769173002: Move native_viewport and gles2 service impls to //services (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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: mojo/services/native_viewport/native_viewport_impl.cc
diff --git a/mojo/services/native_viewport/native_viewport_impl.cc b/mojo/services/native_viewport/native_viewport_impl.cc
deleted file mode 100644
index d6c39d57f695cf052ab4a9aa6d09b0541b0c62eb..0000000000000000000000000000000000000000
--- a/mojo/services/native_viewport/native_viewport_impl.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "mojo/services/native_viewport/native_viewport_impl.h"
-
-#include "base/auto_reset.h"
-#include "base/bind.h"
-#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
-#include "base/time/time.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/converters/input_events/input_events_type_converters.h"
-#include "mojo/converters/surfaces/surfaces_type_converters.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/native_viewport/platform_viewport_headless.h"
-#include "mojo/services/native_viewport/viewport_surface.h"
-#include "ui/events/event.h"
-
-namespace mojo {
-namespace {
-
-bool IsRateLimitedEventType(ui::Event* event) {
- return event->type() == ui::ET_MOUSE_MOVED ||
- event->type() == ui::ET_MOUSE_DRAGGED ||
- event->type() == ui::ET_TOUCH_MOVED;
-}
-
-} // namespace
-
-NativeViewportImpl::NativeViewportImpl(ApplicationImpl* app, bool is_headless)
- : is_headless_(is_headless),
- widget_id_(0u),
- waiting_for_event_ack_(false),
- weak_factory_(this) {
- app->ConnectToService("mojo:surfaces_service", &surfaces_service_);
- // TODO(jamesr): Should be mojo_gpu_service
- app->ConnectToService("mojo:native_viewport_service", &gpu_service_);
-}
-
-NativeViewportImpl::~NativeViewportImpl() {
- // Destroy the NativeViewport early on as it may call us back during
- // destruction and we want to be in a known state.
- platform_viewport_.reset();
-}
-
-void NativeViewportImpl::Create(SizePtr size,
- const Callback<void(uint64_t)>& callback) {
- create_callback_ = callback;
- size_ = size.To<gfx::Size>();
- if (is_headless_)
- platform_viewport_ = PlatformViewportHeadless::Create(this);
- else
- platform_viewport_ = PlatformViewport::Create(this);
- platform_viewport_->Init(gfx::Rect(size.To<gfx::Size>()));
-}
-
-void NativeViewportImpl::Show() {
- platform_viewport_->Show();
-}
-
-void NativeViewportImpl::Hide() {
- platform_viewport_->Hide();
-}
-
-void NativeViewportImpl::Close() {
- DCHECK(platform_viewport_);
- platform_viewport_->Close();
-}
-
-void NativeViewportImpl::SetSize(SizePtr size) {
- platform_viewport_->SetBounds(gfx::Rect(size.To<gfx::Size>()));
-}
-
-void NativeViewportImpl::SubmittedFrame(SurfaceIdPtr child_surface_id) {
- if (child_surface_id_.is_null()) {
- // If this is the first indication that the client will use surfaces,
- // initialize that system.
- // TODO(jamesr): When everything is converted to surfaces initialize this
- // eagerly.
- viewport_surface_.reset(
- new ViewportSurface(surfaces_service_.get(),
- gpu_service_.get(),
- size_,
- child_surface_id.To<cc::SurfaceId>()));
- if (widget_id_)
- viewport_surface_->SetWidgetId(widget_id_);
- }
- child_surface_id_ = child_surface_id.To<cc::SurfaceId>();
- if (viewport_surface_)
- viewport_surface_->SetChildId(child_surface_id_);
-}
-
-void NativeViewportImpl::SetEventDispatcher(
- NativeViewportEventDispatcherPtr dispatcher) {
- event_dispatcher_ = dispatcher.Pass();
-}
-
-void NativeViewportImpl::OnBoundsChanged(const gfx::Rect& bounds) {
- if (size_ == bounds.size())
- return;
-
- size_ = bounds.size();
-
- // Wait for the accelerated widget before telling the client of the bounds.
- if (create_callback_.is_null())
- ProcessOnBoundsChanged();
-}
-
-void NativeViewportImpl::OnAcceleratedWidgetAvailable(
- gfx::AcceleratedWidget widget) {
- widget_id_ = static_cast<uint64_t>(bit_cast<uintptr_t>(widget));
- // TODO(jamesr): Remove once everything is converted to surfaces.
- create_callback_.Run(widget_id_);
- create_callback_.reset();
- // Immediately tell the client of the size. The size may be wrong, if so we'll
- // get the right one in the next OnBoundsChanged() call.
- ProcessOnBoundsChanged();
- if (viewport_surface_)
- viewport_surface_->SetWidgetId(widget_id_);
-}
-
-bool NativeViewportImpl::OnEvent(ui::Event* ui_event) {
- if (!event_dispatcher_.get())
- return false;
-
- // Must not return early before updating capture.
- switch (ui_event->type()) {
- case ui::ET_MOUSE_PRESSED:
- case ui::ET_TOUCH_PRESSED:
- platform_viewport_->SetCapture();
- break;
- case ui::ET_MOUSE_RELEASED:
- case ui::ET_TOUCH_RELEASED:
- platform_viewport_->ReleaseCapture();
- break;
- default:
- break;
- }
-
- if (waiting_for_event_ack_ && IsRateLimitedEventType(ui_event))
- return false;
-
- event_dispatcher_->OnEvent(
- Event::From(*ui_event),
- base::Bind(&NativeViewportImpl::AckEvent, weak_factory_.GetWeakPtr()));
- waiting_for_event_ack_ = true;
- return false;
-}
-
-void NativeViewportImpl::OnDestroyed() {
- client()->OnDestroyed();
-}
-
-void NativeViewportImpl::AckEvent() {
- waiting_for_event_ack_ = false;
-}
-
-void NativeViewportImpl::ProcessOnBoundsChanged() {
- client()->OnSizeChanged(Size::From(size_));
- if (viewport_surface_)
- viewport_surface_->SetSize(size_);
-}
-
-} // namespace mojo
-
« no previous file with comments | « mojo/services/native_viewport/native_viewport_impl.h ('k') | mojo/services/native_viewport/platform_viewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698