A ui::CompositorFrameSink has a WindowSurface. We shouldn't have these two being separate concepts. Instead we should drop the "WindowSurface" concept in Mus and use CompositorFrameSinks everywhere.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a commit 86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a Author: fsamuel <fsamuel@chromium.org> Date: Fri Oct 21 18:35:17 2016 Mus+Ash: Towards Unifying CompositorFrameSink terminology This CL takes a few steps along the way to unify compositor code between Mus+Ash and the browser. 1. BitmapUploader uses ui::CompositorFrameSink. 2. MusBrowserCompositorOutputSurface uses ui::CompositorFrameSink. 3. Introduces ui::Window::RequestCompositorFrameSink that replaces RequestSurface 4. WindowSurface/ServerWindowSurface use MojoCompositorFrameSink interface and surface.mojom is deleted. TODO: Merge WindowSurface and WindowCompositorFrameSink. BUG= 656975 CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel Review-Url: https://chromiumcodereview.appspot.com/2430653002 Cr-Commit-Position: refs/heads/master@{#426851} [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/cc/ipc/mojo_compositor_frame_sink.mojom [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/content/browser/compositor/mus_browser_compositor_output_surface.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/content/browser/compositor/mus_browser_compositor_output_surface.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/content/renderer/mus/compositor_mus_connection.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/content/renderer/mus/compositor_mus_connection.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/content/renderer/mus/render_widget_mus_connection.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/demo/bitmap_uploader.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/demo/bitmap_uploader.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/BUILD.gn [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/compositor_frame_sink.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/compositor_frame_sink.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/tests/test_window_tree.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/tests/test_window_tree.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/window.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/window.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/window_surface.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/window_surface.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/window_surface_client.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/window_tree_client.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/cpp/window_tree_client.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/interfaces/BUILD.gn [delete] https://crrev.com/b363545135e9ac1f943cdfde25b0589acd722942/services/ui/public/interfaces/surface.mojom [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/public/interfaces/window_tree.mojom [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/frame_generator_unittest.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/server_window.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/server_window.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/server_window_surface.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/server_window_surface.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/server_window_surface_manager.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/server_window_surface_manager.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/window_tree.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/window_tree.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/services/ui/ws/window_tree_client_unittest.cc [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.h [modify] https://crrev.com/86c4e98bfe7dbd67d30ce09b4a23d58b0a147c5a/ui/views/mus/surface_context_factory.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/25dbbfb015586119024b310621878990703345f3 commit 25dbbfb015586119024b310621878990703345f3 Author: fsamuel <fsamuel@chromium.org> Date: Fri Oct 21 20:43:53 2016 Mus: surfaces::CompositorFrameSink => DisplayCompositorFrameSink BUG= 656975 Review-Url: https://chromiumcodereview.appspot.com/2435193003 Cr-Commit-Position: refs/heads/master@{#426881} [modify] https://crrev.com/25dbbfb015586119024b310621878990703345f3/services/ui/surfaces/BUILD.gn [rename] https://crrev.com/25dbbfb015586119024b310621878990703345f3/services/ui/surfaces/display_compositor_frame_sink.cc [rename] https://crrev.com/25dbbfb015586119024b310621878990703345f3/services/ui/surfaces/display_compositor_frame_sink.h [modify] https://crrev.com/25dbbfb015586119024b310621878990703345f3/services/ui/ws/frame_generator.cc [modify] https://crrev.com/25dbbfb015586119024b310621878990703345f3/services/ui/ws/frame_generator.h [modify] https://crrev.com/25dbbfb015586119024b310621878990703345f3/services/ui/ws/platform_display.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/d892195197edfcb956c6bd5c65f72763d79c588f commit d892195197edfcb956c6bd5c65f72763d79c588f Author: fsamuel <fsamuel@chromium.org> Date: Sat Oct 22 06:26:40 2016 Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink In an effort to unify Mus+Ash and Chrome terminology, this CL replaces all WindowSurface references with ui::(Server)WindowCompositorFrameSink. This CL is a followup to https://codereview.chromium.org/2430653002/ BUG= 656975 TBR=tsepez@chromium.org for renaming of methods in mojoms. CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel Review-Url: https://chromiumcodereview.appspot.com/2429173005 Cr-Commit-Position: refs/heads/master@{#426984} [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ash/autoclick/mus/autoclick_application.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ash/mus/bridge/wm_root_window_controller_mus.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ash/mus/frame/detached_title_area_renderer.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ash/mus/native_widget_factory_mus.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ash/mus/non_client_frame_controller.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ash/touch_hud/mus/touch_hud_application.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/chrome/browser/ui/views/frame/browser_frame_mus.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/content/browser/compositor/OWNERS [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/content/browser/compositor/mus_browser_compositor_output_surface.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/content/browser/compositor/mus_browser_compositor_output_surface.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/content/renderer/mus/OWNERS [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/content/renderer/mus/compositor_mus_connection.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/content/renderer/mus/compositor_mus_connection.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/content/renderer/mus/render_widget_mus_connection.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/content/renderer/mus/render_widget_mus_connection.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/mash/login/login.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/mash/screenlock/screenlock.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/navigation/view_impl.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/demo/bitmap_uploader.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/demo/bitmap_uploader.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/cpp/BUILD.gn [delete] https://crrev.com/354fdaa367130497882b1c1421ba30882d19ca00/services/ui/public/cpp/compositor_frame_sink.cc [delete] https://crrev.com/354fdaa367130497882b1c1421ba30882d19ca00/services/ui/public/cpp/compositor_frame_sink.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/cpp/tests/test_window_tree.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/cpp/tests/test_window_tree.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/cpp/window.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/cpp/window.h [add] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/cpp/window_compositor_frame_sink.cc [add] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/cpp/window_compositor_frame_sink.h [delete] https://crrev.com/354fdaa367130497882b1c1421ba30882d19ca00/services/ui/public/cpp/window_surface.cc [delete] https://crrev.com/354fdaa367130497882b1c1421ba30882d19ca00/services/ui/public/cpp/window_surface.h [delete] https://crrev.com/354fdaa367130497882b1c1421ba30882d19ca00/services/ui/public/cpp/window_surface_client.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/cpp/window_tree_client.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/cpp/window_tree_client.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/interfaces/window_tree.mojom [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/public/interfaces/window_tree_constants.mojom [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/BUILD.gn [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/access_policy.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/cursor_unittest.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/default_access_policy.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/default_access_policy.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/event_dispatcher_unittest.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/frame_generator.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/frame_generator.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/frame_generator_unittest.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/server_window.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/server_window.h [rename] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/server_window_compositor_frame_sink.cc [rename] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/server_window_compositor_frame_sink.h [add] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/server_window_compositor_frame_sink_manager.cc [add] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/server_window_compositor_frame_sink_manager.h [add] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/server_window_compositor_frame_sink_manager_test_api.cc [add] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/server_window_compositor_frame_sink_manager_test_api.h [delete] https://crrev.com/354fdaa367130497882b1c1421ba30882d19ca00/services/ui/ws/server_window_surface_manager.cc [delete] https://crrev.com/354fdaa367130497882b1c1421ba30882d19ca00/services/ui/ws/server_window_surface_manager.h [delete] https://crrev.com/354fdaa367130497882b1c1421ba30882d19ca00/services/ui/ws/server_window_surface_manager_test_api.cc [delete] https://crrev.com/354fdaa367130497882b1c1421ba30882d19ca00/services/ui/ws/server_window_surface_manager_test_api.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/test_utils.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_finder.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_finder_unittest.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_manager_access_policy.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_manager_access_policy.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_manager_state_unittest.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_server.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_server.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_server_test_impl.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_tree.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_tree.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_tree_client_unittest.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/services/ui/ws/window_tree_unittest.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ui/views/mus/native_widget_mus.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ui/views/mus/native_widget_mus.h [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ui/views/mus/native_widget_mus_unittest.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ui/views/mus/surface_context_factory.cc [modify] https://crrev.com/d892195197edfcb956c6bd5c65f72763d79c588f/ui/views/mus/window_manager_connection.cc
Comment 1 by fsam...@chromium.org
, Oct 18 2016Status: Started (was: Untriaged)