aura: remove dead code
Window::set_frame_sink_id() is no longer needed. BUG=none TEST=none Change-Id: Ic8763ab00167fc94ecd78770f9438b1469ad2c6f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2979911 Reviewed-by: Andrey Kosyakov <caseq@chromium.org> Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org> Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org> Auto-Submit: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/master@{#894957}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
6124d64b75
commit
81729b074c
ash/host
headless/lib/browser
ui
@ -56,8 +56,7 @@ AshWindowTreeHostPlatform::AshWindowTreeHostPlatform(
|
||||
AshWindowTreeHostPlatform::AshWindowTreeHostPlatform()
|
||||
: aura::WindowTreeHostPlatform(std::make_unique<aura::Window>(nullptr)),
|
||||
transformer_helper_(this) {
|
||||
CreateCompositor(viz::FrameSinkId(),
|
||||
/* force_software_compositor */ false,
|
||||
CreateCompositor(/* force_software_compositor */ false,
|
||||
/* use_external_begin_frame_control */ false);
|
||||
CommonInit();
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ namespace headless {
|
||||
|
||||
HeadlessWindowTreeHost::HeadlessWindowTreeHost(
|
||||
bool use_external_begin_frame_control) {
|
||||
CreateCompositor(viz::FrameSinkId(), false, use_external_begin_frame_control);
|
||||
CreateCompositor(false, use_external_begin_frame_control);
|
||||
OnAcceleratedWidgetAvailable();
|
||||
|
||||
focus_client_ = std::make_unique<HeadlessFocusClient>();
|
||||
|
@ -10,6 +10,7 @@
|
||||
#include "base/trace_event/trace_event.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
#include "components/viz/common/features.h"
|
||||
#include "components/viz/common/surfaces/frame_sink_id.h"
|
||||
#include "ui/aura/client/capture_client.h"
|
||||
#include "ui/aura/client/cursor_client.h"
|
||||
#include "ui/aura/env.h"
|
||||
@ -395,7 +396,6 @@ void WindowTreeHost::DestroyDispatcher() {
|
||||
}
|
||||
|
||||
void WindowTreeHost::CreateCompositor(
|
||||
const viz::FrameSinkId& frame_sink_id,
|
||||
bool force_software_compositor,
|
||||
bool use_external_begin_frame_control,
|
||||
bool enable_compositing_based_throttling) {
|
||||
@ -403,11 +403,10 @@ void WindowTreeHost::CreateCompositor(
|
||||
ui::ContextFactory* context_factory = env->context_factory();
|
||||
DCHECK(context_factory);
|
||||
compositor_ = std::make_unique<ui::Compositor>(
|
||||
(frame_sink_id.is_valid()) ? frame_sink_id
|
||||
: context_factory->AllocateFrameSinkId(),
|
||||
context_factory, base::ThreadTaskRunnerHandle::Get(),
|
||||
ui::IsPixelCanvasRecordingEnabled(), use_external_begin_frame_control,
|
||||
force_software_compositor, enable_compositing_based_throttling);
|
||||
context_factory->AllocateFrameSinkId(), context_factory,
|
||||
base::ThreadTaskRunnerHandle::Get(), ui::IsPixelCanvasRecordingEnabled(),
|
||||
use_external_begin_frame_control, force_software_compositor,
|
||||
enable_compositing_based_throttling);
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
compositor_->AddObserver(this);
|
||||
#endif
|
||||
|
@ -16,7 +16,6 @@
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/observer_list.h"
|
||||
#include "build/build_config.h"
|
||||
#include "components/viz/common/surfaces/frame_sink_id.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
#include "ui/aura/aura_export.h"
|
||||
#include "ui/aura/scoped_enable_unadjusted_mouse_events.h"
|
||||
@ -46,6 +45,10 @@ class ViewProp;
|
||||
struct PlatformWindowInitProperties;
|
||||
}
|
||||
|
||||
namespace viz {
|
||||
class FrameSinkId;
|
||||
}
|
||||
|
||||
namespace aura {
|
||||
|
||||
namespace test {
|
||||
@ -265,9 +268,7 @@ class AURA_EXPORT WindowTreeHost : public ui::internal::InputMethodDelegate,
|
||||
void DestroyCompositor();
|
||||
void DestroyDispatcher();
|
||||
|
||||
// If frame_sink_id is not passed in, one will be grabbed from ContextFactory.
|
||||
void CreateCompositor(
|
||||
const viz::FrameSinkId& frame_sink_id = viz::FrameSinkId(),
|
||||
bool force_software_compositor = false,
|
||||
bool use_external_begin_frame_control = false,
|
||||
bool enable_compositing_based_throttling = false);
|
||||
|
@ -57,7 +57,7 @@ WindowTreeHostPlatform::WindowTreeHostPlatform(
|
||||
std::unique_ptr<Window> window)
|
||||
: WindowTreeHost(std::move(window)) {
|
||||
bounds_in_pixels_ = properties.bounds;
|
||||
CreateCompositor(viz::FrameSinkId(), false, false,
|
||||
CreateCompositor(false, false,
|
||||
properties.enable_compositing_based_throttling);
|
||||
CreateAndSetPlatformWindow(std::move(properties));
|
||||
}
|
||||
|
@ -221,9 +221,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
|
||||
|
||||
// Disable compositing on tooltips as a workaround for
|
||||
// https://crbug.com/442111.
|
||||
CreateCompositor(viz::FrameSinkId(),
|
||||
params.force_software_compositing ||
|
||||
params.type == Widget::InitParams::TYPE_TOOLTIP);
|
||||
CreateCompositor(params.force_software_compositing ||
|
||||
params.type == Widget::InitParams::TYPE_TOOLTIP);
|
||||
|
||||
WindowTreeHost::OnAcceleratedWidgetAvailable();
|
||||
InitHost();
|
||||
|
@ -155,7 +155,7 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
|
||||
gfx::Rect pixel_bounds =
|
||||
display::win::ScreenWin::DIPToScreenRect(nullptr, params.bounds);
|
||||
message_handler_->Init(parent_hwnd, pixel_bounds);
|
||||
CreateCompositor(viz::FrameSinkId(), params.force_software_compositing);
|
||||
CreateCompositor(params.force_software_compositing);
|
||||
OnAcceleratedWidgetAvailable();
|
||||
InitHost();
|
||||
window()->Show();
|
||||
|
Reference in New Issue
Block a user