Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit c2074b1

Browse files
mspangCommit Bot
authored and
Commit Bot
committed
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 <[email protected]> Reviewed-by: Jamie Madill <[email protected]>
1 parent df35e38 commit c2074b1

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

util/fuchsia/ScenicWindow.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <lib/fdio/directory.h>
1414
#include <lib/fidl/cpp/interface_ptr.h>
1515
#include <lib/fidl/cpp/interface_request.h>
16+
#include <lib/ui/scenic/cpp/view_token_pair.h>
1617
#include <lib/zx/channel.h>
1718
#include <zircon/status.h>
1819

@@ -76,17 +77,17 @@ bool ScenicWindow::initialize(const std::string &name, size_t width, size_t heig
7677
mShape.SetShape(scenic::Rectangle(&mScenicSession, width, height));
7778
mShape.SetMaterial(mMaterial);
7879

80+
fuchsia::ui::views::ViewToken viewToken;
81+
fuchsia::ui::views::ViewHolderToken viewHolderToken;
82+
std::tie(viewToken, viewHolderToken) = scenic::NewViewTokenPair();
83+
7984
// Create view.
80-
zx::eventpair viewHolderToken;
81-
zx::eventpair viewToken;
82-
zx_status_t status = zx::eventpair::create(0 /* options */, &viewToken, &viewHolderToken);
83-
ASSERT(status == ZX_OK);
8485
mView = std::make_unique<scenic::View>(&mScenicSession, std::move(viewToken), name);
8586
mView->AddChild(mShape);
8687
mScenicSession.Present(0, [](fuchsia::images::PresentationInfo info) {});
8788

8889
// Present view.
89-
mPresenter->Present2(std::move(viewHolderToken), nullptr);
90+
mPresenter->PresentView(std::move(viewHolderToken), nullptr);
9091

9192
mWidth = width;
9293
mHeight = height;

0 commit comments

Comments
 (0)