Commit a53ee483 authored by Amirhossein Simjour's avatar Amirhossein Simjour Committed by Commit Bot

Add name to hosted_ui quad

This will make it easier to write tests and send events directly
to the dialog.

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_vr;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ib9a25666a213e1279a6491bd61331b4e7c8321e4
Reviewed-on: https://chromium-review.googlesource.com/1012917
Commit-Queue: Amirhossein Simjour <asimjour@chromium.org>
Reviewed-by: default avatarYash Malik <ymalik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551008}
parent a6a54b3a
...@@ -79,6 +79,7 @@ static const char* g_ui_element_name_strings[] = { ...@@ -79,6 +79,7 @@ static const char* g_ui_element_name_strings[] = {
"kOmniboxOuterLayout", "kOmniboxOuterLayout",
"kOmniboxShadow", "kOmniboxShadow",
"k2dBrowsingHostedUi", "k2dBrowsingHostedUi",
"k2dBrowsingHostedUiContent",
"k2dBrowsingVisibiltyControlForVoice", "k2dBrowsingVisibiltyControlForVoice",
"k2dBrowsingVisibilityControlForPrompt", "k2dBrowsingVisibilityControlForPrompt",
"k2dBrowsingVisibiltyControlForSiteInfoPrompt", "k2dBrowsingVisibiltyControlForSiteInfoPrompt",
...@@ -126,6 +127,7 @@ static const char* g_ui_element_name_strings[] = { ...@@ -126,6 +127,7 @@ static const char* g_ui_element_name_strings[] = {
"kBackgroundBottom", "kBackgroundBottom",
"kWebVrFloor", "kWebVrFloor",
"kWebVrHostedUi", "kWebVrHostedUi",
"kWebVrHostedUiContent",
"kWebVrTimeoutRoot", "kWebVrTimeoutRoot",
"kWebVrTimeoutSpinner", "kWebVrTimeoutSpinner",
"kWebVrBackground", "kWebVrBackground",
......
...@@ -78,6 +78,7 @@ enum UiElementName { ...@@ -78,6 +78,7 @@ enum UiElementName {
kOmniboxOuterLayout, kOmniboxOuterLayout,
kOmniboxShadow, kOmniboxShadow,
k2dBrowsingHostedUi, k2dBrowsingHostedUi,
k2dBrowsingHostedUiContent,
k2dBrowsingVisibiltyControlForVoice, k2dBrowsingVisibiltyControlForVoice,
k2dBrowsingVisibilityControlForPrompt, k2dBrowsingVisibilityControlForPrompt,
k2dBrowsingVisibiltyControlForSiteInfoPrompt, k2dBrowsingVisibiltyControlForSiteInfoPrompt,
...@@ -125,6 +126,7 @@ enum UiElementName { ...@@ -125,6 +126,7 @@ enum UiElementName {
kBackgroundBottom, kBackgroundBottom,
kWebVrFloor, kWebVrFloor,
kWebVrHostedUi, kWebVrHostedUi,
kWebVrHostedUiContent,
kWebVrTimeoutRoot, kWebVrTimeoutRoot,
kWebVrTimeoutSpinner, kWebVrTimeoutSpinner,
kWebVrBackground, kWebVrBackground,
......
...@@ -677,9 +677,11 @@ std::unique_ptr<UiElement> CreateHostedUi( ...@@ -677,9 +677,11 @@ std::unique_ptr<UiElement> CreateHostedUi(
UiBrowserInterface* browser, UiBrowserInterface* browser,
ContentInputDelegate* content_input_delegate, ContentInputDelegate* content_input_delegate,
UiElementName name, UiElementName name,
UiElementName content_name,
float distance) { float distance) {
auto hosted_ui = Create<ContentElement>( auto hosted_ui =
kNone, kPhaseForeground, content_input_delegate, base::DoNothing()); Create<ContentElement>(content_name, kPhaseForeground,
content_input_delegate, base::DoNothing());
hosted_ui->SetSize(kContentWidth * kHostedUiWidthRatio, hosted_ui->SetSize(kContentWidth * kHostedUiWidthRatio,
kContentHeight * kHostedUiHeightRatio); kContentHeight * kHostedUiHeightRatio);
// The hosted UI doesn't steal focus so that clikcing on an autofill // The hosted UI doesn't steal focus so that clikcing on an autofill
...@@ -882,9 +884,9 @@ void UiSceneCreator::CreateScene() { ...@@ -882,9 +884,9 @@ void UiSceneCreator::CreateScene() {
} }
void UiSceneCreator::Create2dBrowsingHostedUi() { void UiSceneCreator::Create2dBrowsingHostedUi() {
auto hosted_ui_root = auto hosted_ui_root = CreateHostedUi(
CreateHostedUi(model_, browser_, content_input_delegate_, model_, browser_, content_input_delegate_, k2dBrowsingHostedUi,
k2dBrowsingHostedUi, kContentDistance); k2dBrowsingHostedUiContent, kContentDistance);
scene_->AddUiElement(k2dBrowsingRepositioner, std::move(hosted_ui_root)); scene_->AddUiElement(k2dBrowsingRepositioner, std::move(hosted_ui_root));
} }
...@@ -1304,7 +1306,7 @@ void UiSceneCreator::CreateWebVrSubtree() { ...@@ -1304,7 +1306,7 @@ void UiSceneCreator::CreateWebVrSubtree() {
// This is needed to for accepting permissions in WebVR mode. // This is needed to for accepting permissions in WebVR mode.
auto hosted_ui_root = auto hosted_ui_root =
CreateHostedUi(model_, browser_, content_input_delegate_, kWebVrHostedUi, CreateHostedUi(model_, browser_, content_input_delegate_, kWebVrHostedUi,
kTimeoutScreenDisatance); kWebVrHostedUiContent, kTimeoutScreenDisatance);
scene_->AddUiElement(kWebVrViewportAwareRoot, std::move(hosted_ui_root)); scene_->AddUiElement(kWebVrViewportAwareRoot, std::move(hosted_ui_root));
// Note, this cannot be a descendant of the viewport aware root, otherwise it // Note, this cannot be a descendant of the viewport aware root, otherwise it
......
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