Commit 5795d459 authored by Yi Gu's avatar Yi Gu Committed by Commit Bot

Revert "Enable 4hz refresh rate on audio-only cast devices"

This reverts commit 06b2d6e4.

Reason for revert: compile error due to "if (base::base::FeatureList::IsEnabled(kReduceHeadlessFrameRate))"

Original change's description:
> Enable 4hz refresh rate on audio-only cast devices
> 
> Use CastExternalBeginFrameClient object during initialization on
> audio-only cast devices.
> 
> Bug: b/139299756
> Test: Compile and run cast_shell
> Change-Id: Ia5311282398393398bd287f4976a834a79a0e341
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764237
> Commit-Queue: Shawn Gallea <sagallea@google.com>
> Reviewed-by: Michael Spang <spang@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#690175}

TBR=spang@chromium.org,dnicoara@chromium.org,sagallea@google.com

Change-Id: Icf9fa047d3d752369bdfc163f5d4af382e8477c8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/139299756
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769666Reviewed-by: default avatarYi Gu <yigu@chromium.org>
Commit-Queue: Yi Gu <yigu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690179}
parent bc03a748
...@@ -155,10 +155,6 @@ const base::Feature kEnableGeneralAudienceBrowsing{ ...@@ -155,10 +155,6 @@ const base::Feature kEnableGeneralAudienceBrowsing{
const base::Feature kUseQueryableDataBackend{"use_queryable_data_backend", const base::Feature kUseQueryableDataBackend{"use_queryable_data_backend",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
// Lowers frame rate
const base::Feature kReduceHeadlessFrameRate{"reduce_headless_frame_rate",
base::FEATURE_DISABLED_BY_DEFAULT};
// End Chromecast Feature definitions. // End Chromecast Feature definitions.
const base::Feature* kFeatures[] = { const base::Feature* kFeatures[] = {
&kAllowUserMediaAccess, &kAllowUserMediaAccess,
...@@ -168,7 +164,6 @@ const base::Feature* kFeatures[] = { ...@@ -168,7 +164,6 @@ const base::Feature* kFeatures[] = {
&kDisableIdleSocketsCloseOnMemoryPressure, &kDisableIdleSocketsCloseOnMemoryPressure,
&kEnableGeneralAudienceBrowsing, &kEnableGeneralAudienceBrowsing,
&kUseQueryableDataBackend, &kUseQueryableDataBackend,
&kReduceHeadlessFrameRate,
}; };
// An iterator for a base::DictionaryValue. Use an alias for brevity in loops. // An iterator for a base::DictionaryValue. Use an alias for brevity in loops.
......
...@@ -30,7 +30,6 @@ extern const base::Feature kSingleBuffer; ...@@ -30,7 +30,6 @@ extern const base::Feature kSingleBuffer;
extern const base::Feature kDisableIdleSocketsCloseOnMemoryPressure; extern const base::Feature kDisableIdleSocketsCloseOnMemoryPressure;
extern const base::Feature kEnableGeneralAudienceBrowsing; extern const base::Feature kEnableGeneralAudienceBrowsing;
extern const base::Feature kUseQueryableDataBackend; extern const base::Feature kUseQueryableDataBackend;
extern const base::Feature kReduceHeadlessFrameRate;
// Get an iterable list of all of the cast features for checking all features as // Get an iterable list of all of the cast features for checking all features as
// a collection. // a collection.
......
...@@ -4,12 +4,8 @@ ...@@ -4,12 +4,8 @@
#include "chromecast/graphics/cast_window_manager_aura.h" #include "chromecast/graphics/cast_window_manager_aura.h"
#include "base/feature_list.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "chromecast/base/cast_features.h"
#include "chromecast/chromecast_buildflags.h"
#include "chromecast/graphics/cast_external_begin_frame_client.h"
#include "chromecast/graphics/cast_focus_client_aura.h" #include "chromecast/graphics/cast_focus_client_aura.h"
#include "chromecast/graphics/cast_touch_activity_observer.h" #include "chromecast/graphics/cast_touch_activity_observer.h"
#include "chromecast/graphics/cast_touch_event_gate.h" #include "chromecast/graphics/cast_touch_event_gate.h"
...@@ -224,16 +220,8 @@ void CastWindowManagerAura::Setup() { ...@@ -224,16 +220,8 @@ void CastWindowManagerAura::Setup() {
LOG(INFO) << "Starting window manager, bounds: " << host_bounds.ToString(); LOG(INFO) << "Starting window manager, bounds: " << host_bounds.ToString();
CHECK(aura::Env::GetInstance()); CHECK(aura::Env::GetInstance());
#if BUILDFLAG(IS_CAST_AUDIO_ONLY)
if (base::base::FeatureList::IsEnabled(kReduceHeadlessFrameRate))
external_begin_frame_client_ =
std::make_unique<CastExternalBeginFrameClient>(this);
#endif
window_tree_host_ = std::make_unique<CastWindowTreeHost>( window_tree_host_ = std::make_unique<CastWindowTreeHost>(
enable_input_, std::move(properties), external_begin_frame_client_.get()); enable_input_, std::move(properties));
window_tree_host_->InitHost(); window_tree_host_->InitHost();
window_tree_host_->window()->SetLayoutManager(new CastLayoutManager()); window_tree_host_->window()->SetLayoutManager(new CastLayoutManager());
window_tree_host_->SetRootTransform(GetPrimaryDisplayRotationTransform()); window_tree_host_->SetRootTransform(GetPrimaryDisplayRotationTransform());
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <memory> #include <memory>
#include "base/macros.h" #include "base/macros.h"
#include "chromecast/graphics/cast_external_begin_frame_client.h"
#include "chromecast/graphics/cast_window_manager.h" #include "chromecast/graphics/cast_window_manager.h"
#include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/default_capture_client.h"
#include "ui/aura/client/window_parenting_client.h" #include "ui/aura/client/window_parenting_client.h"
...@@ -20,6 +19,10 @@ class ScreenPositionClient; ...@@ -20,6 +19,10 @@ class ScreenPositionClient;
} // namespace client } // namespace client
} // namespace aura } // namespace aura
namespace ui {
class ExternalBeginFrameClient;
} // namespace ui
namespace chromecast { namespace chromecast {
class CastTouchEventGate; class CastTouchEventGate;
...@@ -89,7 +92,6 @@ class CastWindowManagerAura : public CastWindowManager, ...@@ -89,7 +92,6 @@ class CastWindowManagerAura : public CastWindowManager,
private: private:
const bool enable_input_; const bool enable_input_;
std::unique_ptr<CastExternalBeginFrameClient> external_begin_frame_client_;
std::unique_ptr<CastWindowTreeHost> window_tree_host_; std::unique_ptr<CastWindowTreeHost> window_tree_host_;
std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
std::unique_ptr<CastFocusClientAura> focus_client_; std::unique_ptr<CastFocusClientAura> focus_client_;
......
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