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

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

Issue 2385333002: RenderWidgetHostViewChildFrame's called a virtual in its ctor. (Closed)
Patch Set: Move guest ctor to private 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 823b386c0639f2137e3e589722feeceec2115ac1..589d7b7e22ac404be623fbb37847fa1fd63f4336 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -439,6 +439,8 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host,
has_composition_text_(false),
accept_return_character_(false),
begin_frame_source_(nullptr),
+ needs_begin_frames_(false),
+ added_frame_observer_(false),
synthetic_move_sent_(false),
cursor_visibility_state_in_renderer_(UNKNOWN),
#if defined(OS_WIN)
@@ -715,13 +717,22 @@ ui::TextInputClient* RenderWidgetHostViewAura::GetTextInputClient() {
}
void RenderWidgetHostViewAura::SetNeedsBeginFrames(bool needs_begin_frames) {
+ needs_begin_frames_ = needs_begin_frames;
+ UpdateNeedsBeginFramesInternal();
+}
+
+void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() {
if (!begin_frame_source_)
return;
- if (needs_begin_frames)
+ if (added_frame_observer_ == needs_begin_frames_)
+ return;
+
+ if (needs_begin_frames_)
begin_frame_source_->AddObserver(this);
else
begin_frame_source_->RemoveObserver(this);
+ added_frame_observer_ = needs_begin_frames_;
}
void RenderWidgetHostViewAura::OnBeginFrame(
@@ -2927,12 +2938,12 @@ void RenderWidgetHostViewAura::DelegatedFrameHostOnLostCompositorResources() {
void RenderWidgetHostViewAura::SetBeginFrameSource(
cc::BeginFrameSource* source) {
- bool needs_begin_frames = host_->needs_begin_frames();
- if (begin_frame_source_ && needs_begin_frames)
+ if (begin_frame_source_ && added_frame_observer_) {
begin_frame_source_->RemoveObserver(this);
+ added_frame_observer_ = false;
+ }
begin_frame_source_ = source;
- if (begin_frame_source_ && needs_begin_frames)
- begin_frame_source_->AddObserver(this);
+ UpdateNeedsBeginFramesInternal();
}
bool RenderWidgetHostViewAura::IsAutoResizeEnabled() const {

Powered by Google App Engine
This is Rietveld 408576698