Skip to content
This repository has been archived by the owner on Aug 20, 2020. It is now read-only.

Rebase m53 #470

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Rebase m53 #470

wants to merge 29 commits into from

Conversation

liyang342
Copy link

No description provided.

joone and others added 29 commits November 9, 2016 23:40
When we set a instance of OzoneWebUI by calling LinuxUI::SetInstance in
ChromeBrowserMainExtraPartsAura::PreEarlyInitialization, the instance
should be initialized ahead by calling OzoneWebUI::Initialize(). However,
we didn't. As a result, it caused the crash in
InputMethodAuraLinux::InputMethodAuraLinux() because OzoneWebUI::Initialize()
was not called ChromeBrowserMainExtraPartsAura::ToolkitInitialized
due to the USE_X11 macro.

This CL allows OzoneWebUI::Initialize to be called in
ChromeBrowserMainExtraPartsAura::ToolkitInitialized.
This fixes an issue where a mouse button down event would show the
bookmark bubble and the mouse button up event would close it.
We need to update GYP_DEFINES since Wayland was supported in CrOS
…} on the fly

Patch does two main things:

1) Replaces 0002-Remove-usage-of-DesktopFactory.patch
by 0002-Adapt-DesktopFactoryOzone-to-respect-ozone-platform-.patch
in patches/. This way ozone/wayland continues to make use of
the DesktopFactoryOzone abstraction, and tweaks ::GetInstance to
create the proper DesktopFactoryOzone{Platform} instance on the fly.

2) Adds some GYP hooks that actually allows DesktopFactoryOzone::GetInstance
to instantiate the proper DesktopFactoryOzone{Platform} object
on demand, according to either --ozone-platform, or to a
default value.

TEST=regular GYP build
GYP_DEFINES="component=static_library
             clang=0
             use_sysroot=0
             linux_use_bundled_gold=0
             use_ozone=1
             ozone_auto_platforms=0
             ozone_platform_wayland=1
             use_xkbcommon=1"
We need to run chromium with --ignore-gpu-blacklist.
The "Gardening: Adapt to https://codereview.chromium.org/1236923003"
commit (25315fc) seems incomplete.
According to what has been done in desktop_window_tree_host_x11.cc,
we do not have to call SendEventToProcessor for keyboard events.
Also add myself in AUTHORS file.

The following test page can be used to monitor OnKeyPress event:
http://www.asquare.net/javascript/tests/KeyCode.html. Without this
patch, the backspace key is not working properly.
Include desktop_window_tree_host_ozone header instead of its implementation
in desktop_factory_ozone_wayland.cc to solve the following link issue:

  obj/ozone/ui/desktop_aura/views.desktop_window_tree_host_ozone.o: In function `views::DesktopWindowTreeHostOzone::AsWindowTreeHost()':
  src/ozone/ui/desktop_aura/desktop_window_tree_host_ozone.cc:239: multiple definition of `views::DesktopWindowTreeHostOzone::AsWindowTreeHost()'
  src/ozone/ui/desktop_aura/desktop_window_tree_host_ozone.cc:239: first defined here
  obj/ozone/ui/desktop_aura/views.desktop_window_tree_host_ozone.o: In function `views::DesktopWindowTreeHostOzone::ShowMaximizedWithBounds(gfx::Rect const&)':
  src/ozone/ui/desktop_aura/desktop_window_tree_host_ozone.cc:268: multiple definition of `views::DesktopWindowTreeHostOzone::ShowMaximizedWithBounds(gfx::Rect const&)'
  src/ozone/ui/desktop_aura/desktop_window_tree_host_ozone.cc:268: first defined here
  [...]
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants