Commit 4d8df637 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

aura: makes ~WindowPortLocal get Env from window

Rather than Env::GetInstance(). This ensures the right instance is used.

BUG=847992
TEST=covered by tests

Change-Id: I9b75458c1e4d21402ef2e58833c57ff9a289b7a0
Reviewed-on: https://chromium-review.googlesource.com/1176062Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583296}
parent e0066b03
...@@ -67,8 +67,7 @@ WindowPortLocal::WindowPortLocal(Window* window) ...@@ -67,8 +67,7 @@ WindowPortLocal::WindowPortLocal(Window* window)
WindowPortLocal::~WindowPortLocal() { WindowPortLocal::~WindowPortLocal() {
if (frame_sink_id_.is_valid()) { if (frame_sink_id_.is_valid()) {
auto* context_factory_private = auto* context_factory_private = window_->env()->context_factory_private();
aura::Env::GetInstance()->context_factory_private();
auto* host_frame_sink_manager = auto* host_frame_sink_manager =
context_factory_private->GetHostFrameSinkManager(); context_factory_private->GetHostFrameSinkManager();
host_frame_sink_manager->InvalidateFrameSinkId(frame_sink_id_); host_frame_sink_manager->InvalidateFrameSinkId(frame_sink_id_);
......
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