| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ui/views/mus/native_widget_mus.h" | 5 #include "ui/views/mus/native_widget_mus.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 11 #include "base/threading/thread_task_runner_handle.h" | 11 #include "base/threading/thread_task_runner_handle.h" |
| 12 #include "services/ui/common/gpu_service.h" | 12 #include "services/ui/common/gpu_service.h" |
| 13 #include "services/ui/public/cpp/bitmap_uploader.h" | |
| 14 #include "services/ui/public/cpp/property_type_converters.h" | 13 #include "services/ui/public/cpp/property_type_converters.h" |
| 15 #include "services/ui/public/cpp/window.h" | 14 #include "services/ui/public/cpp/window.h" |
| 16 #include "services/ui/public/cpp/window_observer.h" | 15 #include "services/ui/public/cpp/window_observer.h" |
| 17 #include "services/ui/public/cpp/window_property.h" | 16 #include "services/ui/public/cpp/window_property.h" |
| 18 #include "services/ui/public/cpp/window_tree_client.h" | 17 #include "services/ui/public/cpp/window_tree_client.h" |
| 19 #include "services/ui/public/interfaces/cursor.mojom.h" | 18 #include "services/ui/public/interfaces/cursor.mojom.h" |
| 20 #include "services/ui/public/interfaces/window_manager.mojom.h" | 19 #include "services/ui/public/interfaces/window_manager.mojom.h" |
| 21 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 20 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
| 22 #include "services/ui/public/interfaces/window_tree.mojom.h" | 21 #include "services/ui/public/interfaces/window_tree.mojom.h" |
| 23 #include "ui/aura/client/default_capture_client.h" | 22 #include "ui/aura/client/default_capture_client.h" |
| 24 #include "ui/aura/client/window_tree_client.h" | 23 #include "ui/aura/client/window_tree_client.h" |
| 25 #include "ui/aura/env.h" | 24 #include "ui/aura/env.h" |
| 26 #include "ui/aura/layout_manager.h" | 25 #include "ui/aura/layout_manager.h" |
| 27 #include "ui/aura/mus/mus_util.h" | 26 #include "ui/aura/mus/mus_util.h" |
| 28 #include "ui/aura/window.h" | 27 #include "ui/aura/window.h" |
| 29 #include "ui/aura/window_property.h" | 28 #include "ui/aura/window_property.h" |
| 30 #include "ui/base/hit_test.h" | 29 #include "ui/base/hit_test.h" |
| 31 #include "ui/base/view_prop.h" | |
| 32 #include "ui/display/display.h" | 30 #include "ui/display/display.h" |
| 33 #include "ui/display/screen.h" | 31 #include "ui/display/screen.h" |
| 34 #include "ui/display/screen.h" | 32 #include "ui/display/screen.h" |
| 35 #include "ui/events/event.h" | 33 #include "ui/events/event.h" |
| 36 #include "ui/gfx/canvas.h" | 34 #include "ui/gfx/canvas.h" |
| 37 #include "ui/gfx/path.h" | 35 #include "ui/gfx/path.h" |
| 38 #include "ui/native_theme/native_theme_aura.h" | 36 #include "ui/native_theme/native_theme_aura.h" |
| 39 #include "ui/platform_window/platform_window_delegate.h" | 37 #include "ui/platform_window/platform_window_delegate.h" |
| 40 #include "ui/views/mus/surface_context_factory.h" | 38 #include "ui/views/mus/surface_context_factory.h" |
| 41 #include "ui/views/mus/window_manager_constants_converters.h" | 39 #include "ui/views/mus/window_manager_constants_converters.h" |
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 | 521 |
| 524 // TODO(fsamuel): Figure out lifetime of |window_|. | 522 // TODO(fsamuel): Figure out lifetime of |window_|. |
| 525 aura::SetMusWindow(content_, window_); | 523 aura::SetMusWindow(content_, window_); |
| 526 window->SetLocalProperty(kNativeWidgetMusKey, this); | 524 window->SetLocalProperty(kNativeWidgetMusKey, this); |
| 527 | 525 |
| 528 // WindowTreeHost creates the compositor using the ContextFactory from | 526 // WindowTreeHost creates the compositor using the ContextFactory from |
| 529 // aura::Env. Install |context_factory_| there so that |context_factory_| is | 527 // aura::Env. Install |context_factory_| there so that |context_factory_| is |
| 530 // picked up. | 528 // picked up. |
| 531 ui::ContextFactory* default_context_factory = | 529 ui::ContextFactory* default_context_factory = |
| 532 aura::Env::GetInstance()->context_factory(); | 530 aura::Env::GetInstance()->context_factory(); |
| 533 // For Chrome, we need the GpuProcessTransportFactory so that renderer and | |
| 534 // browser pixels are composited into a single backing SoftwareOutputDeviceMus | |
| 535 // (which also requires the BitmapUploader). | |
| 536 bool needs_bitmap_uploader = false; | |
| 537 if (!default_context_factory) { | 531 if (!default_context_factory) { |
| 538 context_factory_.reset( | 532 context_factory_.reset( |
| 539 new SurfaceContextFactory(connector, window_, surface_type_)); | 533 new SurfaceContextFactory(connector, window_, surface_type_)); |
| 540 aura::Env::GetInstance()->set_context_factory(context_factory_.get()); | 534 aura::Env::GetInstance()->set_context_factory(context_factory_.get()); |
| 541 } else if (!ui::GpuService::UseChromeGpuCommandBuffer()) { | |
| 542 // Only use the BitmapUploader when the mojo command buffer is being used. | |
| 543 needs_bitmap_uploader = true; | |
| 544 } | 535 } |
| 545 | 536 |
| 546 window_tree_host_.reset(new WindowTreeHostMus(this, window_)); | 537 window_tree_host_.reset(new WindowTreeHostMus(this, window_)); |
| 547 if (needs_bitmap_uploader) { | |
| 548 bitmap_uploader_.reset(new ui::BitmapUploader(window)); | |
| 549 bitmap_uploader_->Init(connector); | |
| 550 prop_ = base::MakeUnique<ui::ViewProp>( | |
| 551 window_tree_host_->GetAcceleratedWidget(), | |
| 552 ui::kBitmapUploaderForAcceleratedWidget, | |
| 553 bitmap_uploader_.get()); | |
| 554 } | |
| 555 | |
| 556 aura::Env::GetInstance()->set_context_factory(default_context_factory); | 538 aura::Env::GetInstance()->set_context_factory(default_context_factory); |
| 557 } | 539 } |
| 558 | 540 |
| 559 NativeWidgetMus::~NativeWidgetMus() { | 541 NativeWidgetMus::~NativeWidgetMus() { |
| 560 if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) { | 542 if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) { |
| 561 DCHECK(!window_); | 543 DCHECK(!window_); |
| 562 delete native_widget_delegate_; | 544 delete native_widget_delegate_; |
| 563 } else { | 545 } else { |
| 564 if (window_) | 546 if (window_) |
| 565 window_->set_input_event_handler(nullptr); | 547 window_->set_input_event_handler(nullptr); |
| (...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1438 | 1420 |
| 1439 gfx::Path mask_path; | 1421 gfx::Path mask_path; |
| 1440 native_widget_delegate_->GetHitTestMask(&mask_path); | 1422 native_widget_delegate_->GetHitTestMask(&mask_path); |
| 1441 // TODO(jamescook): Use the full path for the mask. | 1423 // TODO(jamescook): Use the full path for the mask. |
| 1442 gfx::Rect mask_rect = | 1424 gfx::Rect mask_rect = |
| 1443 gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds())); | 1425 gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds())); |
| 1444 window_->SetHitTestMask(mask_rect); | 1426 window_->SetHitTestMask(mask_rect); |
| 1445 } | 1427 } |
| 1446 | 1428 |
| 1447 } // namespace views | 1429 } // namespace views |
| OLD | NEW |