Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 2390813002: Revert of Move synthetic gesture input to be aligned with BeginFrame. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index fe65bc1d0651a379c827f89cdeadb5937170cf36..5fb48340e8e0d9797cbd848df330f0bc9e38b379 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -440,9 +440,6 @@
has_composition_text_(false),
accept_return_character_(false),
begin_frame_source_(nullptr),
- needs_begin_frames_(false),
- needs_flush_input_(false),
- added_frame_observer_(false),
synthetic_move_sent_(false),
cursor_visibility_state_in_renderer_(UNKNOWN),
#if defined(OS_WIN)
@@ -715,25 +712,10 @@
}
void RenderWidgetHostViewAura::SetNeedsBeginFrames(bool needs_begin_frames) {
- needs_begin_frames_ = needs_begin_frames;
- UpdateNeedsBeginFramesInternal();
-}
-
-void RenderWidgetHostViewAura::OnSetNeedsFlushInput() {
- needs_flush_input_ = true;
- UpdateNeedsBeginFramesInternal();
-}
-
-void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() {
if (!begin_frame_source_)
return;
- bool needs_frame = needs_begin_frames_ || needs_flush_input_;
- if (needs_frame == added_frame_observer_)
- return;
-
- added_frame_observer_ = needs_frame;
- if (needs_frame)
+ if (needs_begin_frames)
begin_frame_source_->AddObserver(this);
else
begin_frame_source_->RemoveObserver(this);
@@ -741,9 +723,6 @@
void RenderWidgetHostViewAura::OnBeginFrame(
const cc::BeginFrameArgs& args) {
- needs_flush_input_ = false;
- host_->FlushInput();
- UpdateNeedsBeginFramesInternal();
host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args));
last_begin_frame_args_ = args;
}
@@ -2945,12 +2924,12 @@
void RenderWidgetHostViewAura::SetBeginFrameSource(
cc::BeginFrameSource* source) {
- if (begin_frame_source_ && added_frame_observer_) {
+ bool needs_begin_frames = host_->needs_begin_frames();
+ if (begin_frame_source_ && needs_begin_frames)
begin_frame_source_->RemoveObserver(this);
- added_frame_observer_ = false;
- }
begin_frame_source_ = source;
- UpdateNeedsBeginFramesInternal();
+ if (begin_frame_source_ && needs_begin_frames)
+ begin_frame_source_->AddObserver(this);
}
bool RenderWidgetHostViewAura::IsAutoResizeEnabled() const {

Powered by Google App Engine
This is Rietveld 408576698