Commit c2074b14 by Michael Spang Committed by Commit Bot

Fuchsia: Remove use of deprecated API Presenter::Present2

Bug: chromium:943604 Test: angle_end2end_tests Change-Id: Id4bd293bea0587687d1656998bc6d986fd9fb8e9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1530027 Commit-Queue: Michael Spang <spang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent df35e382
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <lib/fdio/directory.h> #include <lib/fdio/directory.h>
#include <lib/fidl/cpp/interface_ptr.h> #include <lib/fidl/cpp/interface_ptr.h>
#include <lib/fidl/cpp/interface_request.h> #include <lib/fidl/cpp/interface_request.h>
#include <lib/ui/scenic/cpp/view_token_pair.h>
#include <lib/zx/channel.h> #include <lib/zx/channel.h>
#include <zircon/status.h> #include <zircon/status.h>
...@@ -76,17 +77,17 @@ bool ScenicWindow::initialize(const std::string &name, size_t width, size_t heig ...@@ -76,17 +77,17 @@ bool ScenicWindow::initialize(const std::string &name, size_t width, size_t heig
mShape.SetShape(scenic::Rectangle(&mScenicSession, width, height)); mShape.SetShape(scenic::Rectangle(&mScenicSession, width, height));
mShape.SetMaterial(mMaterial); mShape.SetMaterial(mMaterial);
fuchsia::ui::views::ViewToken viewToken;
fuchsia::ui::views::ViewHolderToken viewHolderToken;
std::tie(viewToken, viewHolderToken) = scenic::NewViewTokenPair();
// Create view. // Create view.
zx::eventpair viewHolderToken;
zx::eventpair viewToken;
zx_status_t status = zx::eventpair::create(0 /* options */, &viewToken, &viewHolderToken);
ASSERT(status == ZX_OK);
mView = std::make_unique<scenic::View>(&mScenicSession, std::move(viewToken), name); mView = std::make_unique<scenic::View>(&mScenicSession, std::move(viewToken), name);
mView->AddChild(mShape); mView->AddChild(mShape);
mScenicSession.Present(0, [](fuchsia::images::PresentationInfo info) {}); mScenicSession.Present(0, [](fuchsia::images::PresentationInfo info) {});
// Present view. // Present view.
mPresenter->Present2(std::move(viewHolderToken), nullptr); mPresenter->PresentView(std::move(viewHolderToken), nullptr);
mWidth = width; mWidth = width;
mHeight = height; mHeight = height;
......
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