Commit 7a964130 authored by Wez's avatar Wez Committed by Commit Bot

Roll Fuchsia SDK from 3eeb74368527 to 0250d4201e9f


The AutoRoll server is located here: https://fuchsia-sdk-chromium-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.


CQ_INCLUDE_TRYBOTS=luci.chromium.try:fuchsia_arm64_cast_audio;luci.chromium.try:fuchsia_x64_cast_audio
TBR=cr-fuchsia+bot@chromium.org

Change-Id: I171b21d7de8868bc27767a8dcbb2b9a5bc954d39
Reviewed-on: https://chromium-review.googlesource.com/1149912Reviewed-by: default avatarWez <wez@chromium.org>
Reviewed-by: default avatarFuchsia SDK Autoroller <fuchsia-sdk-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577844}
parent 91b8d879
3eeb7436852779037db94d7c808a86a96882d7c7 0250d4201e9f4e1324362859cf38d37ba3f473d8
\ No newline at end of file \ No newline at end of file
...@@ -88,7 +88,7 @@ ShellPlatformDataAura::ShellPlatformDataAura(const gfx::Size& initial_size) { ...@@ -88,7 +88,7 @@ ShellPlatformDataAura::ShellPlatformDataAura(const gfx::Size& initial_size) {
->GetPlatformProperties() ->GetPlatformProperties()
.needs_view_owner_request) { .needs_view_owner_request) {
// Initialize view_owner_request for the new instance. // Initialize view_owner_request for the new instance.
fidl::InterfaceHandle<fuchsia::ui::views_v1_token::ViewOwner> view_owner; fidl::InterfaceHandle<fuchsia::ui::viewsv1token::ViewOwner> view_owner;
properties.view_owner_request = view_owner.NewRequest(); properties.view_owner_request = view_owner.NewRequest();
// Request Presenter to show the view full-screen. // Request Presenter to show the view full-screen.
......
...@@ -253,7 +253,7 @@ fuchsia_sdk_fidl_pkg("policy") { ...@@ -253,7 +253,7 @@ fuchsia_sdk_fidl_pkg("policy") {
"presenter.fidl", "presenter.fidl",
] ]
deps = [ deps = [
":views_v1", ":viewsv1",
] ]
} }
...@@ -324,7 +324,7 @@ fuchsia_sdk_fidl_pkg("views") { ...@@ -324,7 +324,7 @@ fuchsia_sdk_fidl_pkg("views") {
] ]
} }
fuchsia_sdk_fidl_pkg("views_v1") { fuchsia_sdk_fidl_pkg("viewsv1") {
namespace = "fuchsia.ui" namespace = "fuchsia.ui"
namespace_path = "fuchsia/ui" namespace_path = "fuchsia/ui"
...@@ -342,11 +342,11 @@ fuchsia_sdk_fidl_pkg("views_v1") { ...@@ -342,11 +342,11 @@ fuchsia_sdk_fidl_pkg("views_v1") {
":images", ":images",
":math", ":math",
":scenic", ":scenic",
":views_v1_token", ":viewsv1token",
] ]
} }
fuchsia_sdk_fidl_pkg("views_v1_token") { fuchsia_sdk_fidl_pkg("viewsv1token") {
namespace = "fuchsia.ui" namespace = "fuchsia.ui"
namespace_path = "fuchsia/ui" namespace_path = "fuchsia/ui"
......
...@@ -31,8 +31,8 @@ source_set("scenic") { ...@@ -31,8 +31,8 @@ source_set("scenic") {
"//third_party/fuchsia-sdk:images", "//third_party/fuchsia-sdk:images",
"//third_party/fuchsia-sdk:mem", "//third_party/fuchsia-sdk:mem",
"//third_party/fuchsia-sdk:scenic", "//third_party/fuchsia-sdk:scenic",
"//third_party/fuchsia-sdk:views_v1", "//third_party/fuchsia-sdk:viewsv1",
"//third_party/fuchsia-sdk:views_v1_token", "//third_party/fuchsia-sdk:viewsv1token",
"//ui/base", "//ui/base",
"//ui/display/manager", "//ui/display/manager",
"//ui/events:dom_keycode_converter", "//ui/events:dom_keycode_converter",
......
...@@ -40,7 +40,7 @@ int KeyModifiersToFlags(int modifiers) { ...@@ -40,7 +40,7 @@ int KeyModifiersToFlags(int modifiers) {
ScenicWindow::ScenicWindow( ScenicWindow::ScenicWindow(
ScenicWindowManager* window_manager, ScenicWindowManager* window_manager,
PlatformWindowDelegate* delegate, PlatformWindowDelegate* delegate,
fidl::InterfaceRequest<fuchsia::ui::views_v1_token::ViewOwner> fidl::InterfaceRequest<fuchsia::ui::viewsv1token::ViewOwner>
view_owner_request) view_owner_request)
: manager_(window_manager), : manager_(window_manager),
delegate_(delegate), delegate_(delegate),
...@@ -191,7 +191,7 @@ void ScenicWindow::UpdateSize() { ...@@ -191,7 +191,7 @@ void ScenicWindow::UpdateSize() {
} }
void ScenicWindow::OnPropertiesChanged( void ScenicWindow::OnPropertiesChanged(
fuchsia::ui::views_v1::ViewProperties properties, fuchsia::ui::viewsv1::ViewProperties properties,
OnPropertiesChangedCallback callback) { OnPropertiesChangedCallback callback) {
if (properties.view_layout) { if (properties.view_layout) {
size_dips_.SetSize(properties.view_layout->size.width, size_dips_.SetSize(properties.view_layout->size.width,
...@@ -259,7 +259,7 @@ void ScenicWindow::OnEvent(fuchsia::ui::input::InputEvent event, ...@@ -259,7 +259,7 @@ void ScenicWindow::OnEvent(fuchsia::ui::input::InputEvent event,
} }
void ScenicWindow::OnViewError() { void ScenicWindow::OnViewError() {
VLOG(1) << "views_v1::View connection was closed."; VLOG(1) << "viewsv1::View connection was closed.";
delegate_->OnClosed(); delegate_->OnClosed();
} }
...@@ -290,7 +290,8 @@ bool ScenicWindow::OnMouseEvent(const fuchsia::ui::input::PointerEvent& event) { ...@@ -290,7 +290,8 @@ bool ScenicWindow::OnMouseEvent(const fuchsia::ui::input::PointerEvent& event) {
case fuchsia::ui::input::PointerEventPhase::CANCEL: case fuchsia::ui::input::PointerEventPhase::CANCEL:
case fuchsia::ui::input::PointerEventPhase::ADD: case fuchsia::ui::input::PointerEventPhase::ADD:
case fuchsia::ui::input::PointerEventPhase::REMOVE: case fuchsia::ui::input::PointerEventPhase::REMOVE:
NOTREACHED() << "Unexpected mouse phase " << event.phase; NOTREACHED() << "Unexpected mouse phase "
<< fidl::ToUnderlying(event.phase);
return false; return false;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define UI_OZONE_PLATFORM_SCENIC_SCENIC_WINDOW_H_ #define UI_OZONE_PLATFORM_SCENIC_SCENIC_WINDOW_H_
#include <fuchsia/ui/input/cpp/fidl.h> #include <fuchsia/ui/input/cpp/fidl.h>
#include <fuchsia/ui/views_v1/cpp/fidl.h> #include <fuchsia/ui/viewsv1/cpp/fidl.h>
#include "base/macros.h" #include "base/macros.h"
#include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect.h"
...@@ -24,7 +24,7 @@ class PlatformWindowDelegate; ...@@ -24,7 +24,7 @@ class PlatformWindowDelegate;
class OZONE_EXPORT ScenicWindow : public PlatformWindow, class OZONE_EXPORT ScenicWindow : public PlatformWindow,
public ScenicSessionListener, public ScenicSessionListener,
public fuchsia::ui::views_v1::ViewListener, public fuchsia::ui::viewsv1::ViewListener,
public fuchsia::ui::input::InputListener { public fuchsia::ui::input::InputListener {
public: public:
// Both |window_manager| and |delegate| must outlive the ScenicWindow. // Both |window_manager| and |delegate| must outlive the ScenicWindow.
...@@ -33,7 +33,7 @@ class OZONE_EXPORT ScenicWindow : public PlatformWindow, ...@@ -33,7 +33,7 @@ class OZONE_EXPORT ScenicWindow : public PlatformWindow,
// be used to add the view to a ViewContainer. // be used to add the view to a ViewContainer.
ScenicWindow(ScenicWindowManager* window_manager, ScenicWindow(ScenicWindowManager* window_manager,
PlatformWindowDelegate* delegate, PlatformWindowDelegate* delegate,
fidl::InterfaceRequest<fuchsia::ui::views_v1_token::ViewOwner> fidl::InterfaceRequest<fuchsia::ui::viewsv1token::ViewOwner>
view_owner_request); view_owner_request);
~ScenicWindow() override; ~ScenicWindow() override;
...@@ -64,7 +64,7 @@ class OZONE_EXPORT ScenicWindow : public PlatformWindow, ...@@ -64,7 +64,7 @@ class OZONE_EXPORT ScenicWindow : public PlatformWindow,
private: private:
// views::ViewListener interface. // views::ViewListener interface.
void OnPropertiesChanged(fuchsia::ui::views_v1::ViewProperties properties, void OnPropertiesChanged(fuchsia::ui::viewsv1::ViewProperties properties,
OnPropertiesChangedCallback callback) override; OnPropertiesChangedCallback callback) override;
// fuchsia::ui::input::InputListener interface. // fuchsia::ui::input::InputListener interface.
...@@ -90,8 +90,8 @@ class OZONE_EXPORT ScenicWindow : public PlatformWindow, ...@@ -90,8 +90,8 @@ class OZONE_EXPORT ScenicWindow : public PlatformWindow,
gfx::AcceleratedWidget const window_id_; gfx::AcceleratedWidget const window_id_;
// Underlying View in the view_manager. // Underlying View in the view_manager.
fuchsia::ui::views_v1::ViewPtr view_; fuchsia::ui::viewsv1::ViewPtr view_;
fidl::Binding<fuchsia::ui::views_v1::ViewListener> view_listener_binding_; fidl::Binding<fuchsia::ui::viewsv1::ViewListener> view_listener_binding_;
// Scenic session used for all drawing operations in this View. // Scenic session used for all drawing operations in this View.
ScenicSession scenic_session_; ScenicSession scenic_session_;
......
...@@ -11,11 +11,10 @@ namespace ui { ...@@ -11,11 +11,10 @@ namespace ui {
ScenicWindowManager::ScenicWindowManager() = default; ScenicWindowManager::ScenicWindowManager() = default;
ScenicWindowManager::~ScenicWindowManager() = default; ScenicWindowManager::~ScenicWindowManager() = default;
fuchsia::ui::views_v1::ViewManager* ScenicWindowManager::GetViewManager() { fuchsia::ui::viewsv1::ViewManager* ScenicWindowManager::GetViewManager() {
if (!view_manager_) { if (!view_manager_) {
view_manager_ = view_manager_ = base::fuchsia::ComponentContext::GetDefault()
base::fuchsia::ComponentContext::GetDefault() ->ConnectToService<fuchsia::ui::viewsv1::ViewManager>();
->ConnectToService<fuchsia::ui::views_v1::ViewManager>();
view_manager_.set_error_handler( view_manager_.set_error_handler(
[this]() { LOG(FATAL) << "ViewManager connection failed."; }); [this]() { LOG(FATAL) << "ViewManager connection failed."; });
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <stdint.h> #include <stdint.h>
#include <memory> #include <memory>
#include <fuchsia/ui/views_v1/cpp/fidl.h> #include <fuchsia/ui/viewsv1/cpp/fidl.h>
#include "base/containers/id_map.h" #include "base/containers/id_map.h"
#include "base/macros.h" #include "base/macros.h"
...@@ -36,7 +36,7 @@ class OZONE_EXPORT ScenicWindowManager { ...@@ -36,7 +36,7 @@ class OZONE_EXPORT ScenicWindowManager {
// ViewManager and Scenic services that are used by ScenicWindow. Both // ViewManager and Scenic services that are used by ScenicWindow. Both
// interfaces are initialized lazily on the first call and they don't change // interfaces are initialized lazily on the first call and they don't change
// afterwards. ScenicWindowManager keeps the ownership. // afterwards. ScenicWindowManager keeps the ownership.
fuchsia::ui::views_v1::ViewManager* GetViewManager(); fuchsia::ui::viewsv1::ViewManager* GetViewManager();
fuchsia::ui::scenic::Scenic* GetScenic(); fuchsia::ui::scenic::Scenic* GetScenic();
// Called by ScenicWindow when a new window instance is created. Returns // Called by ScenicWindow when a new window instance is created. Returns
...@@ -51,7 +51,7 @@ class OZONE_EXPORT ScenicWindowManager { ...@@ -51,7 +51,7 @@ class OZONE_EXPORT ScenicWindowManager {
private: private:
base::IDMap<ScenicWindow*> windows_; base::IDMap<ScenicWindow*> windows_;
fuchsia::ui::views_v1::ViewManagerPtr view_manager_; fuchsia::ui::viewsv1::ViewManagerPtr view_manager_;
fuchsia::ui::scenic::ScenicPtr scenic_; fuchsia::ui::scenic::ScenicPtr scenic_;
DISALLOW_COPY_AND_ASSIGN(ScenicWindowManager); DISALLOW_COPY_AND_ASSIGN(ScenicWindowManager);
......
...@@ -24,7 +24,7 @@ source_set("platform_window") { ...@@ -24,7 +24,7 @@ source_set("platform_window") {
if (is_fuchsia) { if (is_fuchsia) {
public_deps = [ public_deps = [
"//third_party/fuchsia-sdk:views_v1_token", "//third_party/fuchsia-sdk:viewsv1token",
] ]
} }
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "ui/gfx/native_widget_types.h" #include "ui/gfx/native_widget_types.h"
#if defined(OS_FUCHSIA) #if defined(OS_FUCHSIA)
#include <fuchsia/ui/views_v1_token/cpp/fidl.h> #include <fuchsia/ui/viewsv1token/cpp/fidl.h>
#endif #endif
namespace ui { namespace ui {
...@@ -45,7 +45,7 @@ struct PlatformWindowInitProperties { ...@@ -45,7 +45,7 @@ struct PlatformWindowInitProperties {
gfx::AcceleratedWidget parent_widget = gfx::kNullAcceleratedWidget; gfx::AcceleratedWidget parent_widget = gfx::kNullAcceleratedWidget;
#if defined(OS_FUCHSIA) #if defined(OS_FUCHSIA)
fidl::InterfaceRequest<fuchsia::ui::views_v1_token::ViewOwner> fidl::InterfaceRequest<fuchsia::ui::viewsv1token::ViewOwner>
view_owner_request; view_owner_request;
#endif #endif
}; };
......
...@@ -193,6 +193,6 @@ fidl_library("fidl") { ...@@ -193,6 +193,6 @@ fidl_library("fidl") {
public_deps = [ public_deps = [
"//third_party/fuchsia-sdk:gfx", "//third_party/fuchsia-sdk:gfx",
"//third_party/fuchsia-sdk:sys", "//third_party/fuchsia-sdk:sys",
"//third_party/fuchsia-sdk:views_v1", "//third_party/fuchsia-sdk:viewsv1",
] ]
} }
...@@ -80,7 +80,7 @@ bool ComponentControllerImpl::BindToRequest( ...@@ -80,7 +80,7 @@ bool ComponentControllerImpl::BindToRequest(
service_directory_ = std::make_unique<base::fuchsia::ServiceDirectory>( service_directory_ = std::make_unique<base::fuchsia::ServiceDirectory>(
std::move(startup_info.launch_info.directory_request)); std::move(startup_info.launch_info.directory_request));
view_provider_binding_ = std::make_unique< view_provider_binding_ = std::make_unique<
base::fuchsia::ScopedServiceBinding<fuchsia::ui::views_v1::ViewProvider>>( base::fuchsia::ScopedServiceBinding<fuchsia::ui::viewsv1::ViewProvider>>(
service_directory_.get(), this); service_directory_.get(), this);
return true; return true;
...@@ -104,7 +104,7 @@ void ComponentControllerImpl::OnNavigationStateChanged( ...@@ -104,7 +104,7 @@ void ComponentControllerImpl::OnNavigationStateChanged(
OnNavigationStateChangedCallback callback) {} OnNavigationStateChangedCallback callback) {}
void ComponentControllerImpl::CreateView( void ComponentControllerImpl::CreateView(
fidl::InterfaceRequest<fuchsia::ui::views_v1_token::ViewOwner> view_owner, fidl::InterfaceRequest<fuchsia::ui::viewsv1token::ViewOwner> view_owner,
fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services) { fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services) {
DCHECK(frame_); DCHECK(frame_);
DCHECK(!view_is_bound_); DCHECK(!view_is_bound_);
......
...@@ -27,7 +27,7 @@ class WebContentRunner; ...@@ -27,7 +27,7 @@ class WebContentRunner;
// chromium::web::Frame. // chromium::web::Frame.
class ComponentControllerImpl : public fuchsia::sys::ComponentController, class ComponentControllerImpl : public fuchsia::sys::ComponentController,
public chromium::web::FrameObserver, public chromium::web::FrameObserver,
public fuchsia::ui::views_v1::ViewProvider { public fuchsia::ui::viewsv1::ViewProvider {
public: public:
~ComponentControllerImpl() override; ~ComponentControllerImpl() override;
...@@ -51,10 +51,9 @@ class ComponentControllerImpl : public fuchsia::sys::ComponentController, ...@@ -51,10 +51,9 @@ class ComponentControllerImpl : public fuchsia::sys::ComponentController,
chromium::web::NavigationStateChangeDetails change, chromium::web::NavigationStateChangeDetails change,
OnNavigationStateChangedCallback callback) override; OnNavigationStateChangedCallback callback) override;
// fuchsia::ui::views_v1::ViewProvider implementation. // fuchsia::ui::viewsv1::ViewProvider implementation.
void CreateView( void CreateView(
fidl::InterfaceRequest<::fuchsia::ui::views_v1_token::ViewOwner> fidl::InterfaceRequest<::fuchsia::ui::viewsv1token::ViewOwner> view_owner,
view_owner,
fidl::InterfaceRequest<::fuchsia::sys::ServiceProvider> services) fidl::InterfaceRequest<::fuchsia::sys::ServiceProvider> services)
override; override;
...@@ -80,7 +79,7 @@ class ComponentControllerImpl : public fuchsia::sys::ComponentController, ...@@ -80,7 +79,7 @@ class ComponentControllerImpl : public fuchsia::sys::ComponentController,
// Objects used for binding and exporting the ViewProvider service. // Objects used for binding and exporting the ViewProvider service.
std::unique_ptr<base::fuchsia::ServiceDirectory> service_directory_; std::unique_ptr<base::fuchsia::ServiceDirectory> service_directory_;
std::unique_ptr< std::unique_ptr<
base::fuchsia::ScopedServiceBinding<fuchsia::ui::views_v1::ViewProvider>> base::fuchsia::ScopedServiceBinding<fuchsia::ui::viewsv1::ViewProvider>>
view_provider_binding_; view_provider_binding_;
std::vector<WaitCallback> termination_wait_callbacks_; std::vector<WaitCallback> termination_wait_callbacks_;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include <fuchsia/ui/views_v1/cpp/fidl.h> #include <fuchsia/ui/viewsv1/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h> #include <lib/fidl/cpp/binding.h>
#include <utility> #include <utility>
......
...@@ -68,7 +68,7 @@ FrameImpl::~FrameImpl() { ...@@ -68,7 +68,7 @@ FrameImpl::~FrameImpl() {
} }
void FrameImpl::CreateView( void FrameImpl::CreateView(
fidl::InterfaceRequest<fuchsia::ui::views_v1_token::ViewOwner> view_owner, fidl::InterfaceRequest<fuchsia::ui::viewsv1token::ViewOwner> view_owner,
fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services) { fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services) {
ui::PlatformWindowInitProperties properties; ui::PlatformWindowInitProperties properties;
properties.view_owner_request = std::move(view_owner); properties.view_owner_request = std::move(view_owner);
......
...@@ -40,7 +40,7 @@ class FrameImpl : public chromium::web::Frame, ...@@ -40,7 +40,7 @@ class FrameImpl : public chromium::web::Frame,
// chromium::web::Frame implementation. // chromium::web::Frame implementation.
void CreateView( void CreateView(
fidl::InterfaceRequest<fuchsia::ui::views_v1_token::ViewOwner> view_owner, fidl::InterfaceRequest<fuchsia::ui::viewsv1token::ViewOwner> view_owner,
fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services) override; fidl::InterfaceRequest<fuchsia::sys::ServiceProvider> services) override;
void GetNavigationController( void GetNavigationController(
fidl::InterfaceRequest<chromium::web::NavigationController> controller) fidl::InterfaceRequest<chromium::web::NavigationController> controller)
......
...@@ -11,7 +11,7 @@ interface Frame { ...@@ -11,7 +11,7 @@ interface Frame {
// //
// |view_owner|: Request for the Frame's ViewOwner. // |view_owner|: Request for the Frame's ViewOwner.
// |services|: Request for the Frame's View-related services. // |services|: Request for the Frame's View-related services.
1: CreateView(request<fuchsia.ui.views_v1_token.ViewOwner> view_owner, 1: CreateView(request<fuchsia.ui.viewsv1token.ViewOwner> view_owner,
request<fuchsia.sys.ServiceProvider>? services); request<fuchsia.sys.ServiceProvider>? services);
// Returns an interface through which the frame may be navigated to // Returns an interface through which the frame may be navigated to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment