Commit 33211d46 authored by Christopher Cameron's avatar Christopher Cameron Committed by Commit Bot

WebContentsViewMac: Save parent ui::Layer in SetParentUiLayer

This was not being saved, resulting in new child RWHViewMacs having
their parent ui::Layer set to nullptr.

Bug: 859834
Change-Id: I8e66370381406d8cc1dfb2aac9d81397c1775831
Reviewed-on: https://chromium-review.googlesource.com/1148940Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577958}
parent d6ec8154
......@@ -450,15 +450,13 @@ void WebContentsViewMac::CloseTab() {
}
void WebContentsViewMac::SetParentUiLayer(ui::Layer* parent_ui_layer) {
parent_ui_layer_ = parent_ui_layer;
// Remove any child NSViews that have been destroyed.
for (auto iter = child_views_.begin(); iter != child_views_.end();) {
auto iter_next = iter;
iter_next++;
if (*iter)
(*iter)->SetParentUiLayer(parent_ui_layer);
(*iter++)->SetParentUiLayer(parent_ui_layer);
else
child_views_.erase(iter);
iter = iter_next;
iter = child_views_.erase(iter);
}
}
......
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