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

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

Issue 1124523003: Revert of Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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.h
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index f3f6869bf9517b771e94dedca0c3d627b6d0be7b..69fe661283393fdb0315cda39e74758e57cc291c 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -20,7 +20,6 @@
#include "content/browser/compositor/delegated_frame_host.h"
#include "content/browser/compositor/image_transport_factory.h"
#include "content/browser/compositor/owned_mailbox.h"
-#include "content/browser/renderer_host/begin_frame_observer_proxy.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/common/content_export.h"
#include "content/common/cursors/webcursor.h"
@@ -81,7 +80,6 @@
class CONTENT_EXPORT RenderWidgetHostViewAura
: public RenderWidgetHostViewBase,
public DelegatedFrameHostClient,
- public BeginFrameObserverProxyClient,
public ui::TextInputClient,
public gfx::DisplayObserver,
public aura::WindowTreeHostObserver,
@@ -473,9 +471,9 @@
int output_surface_id,
const cc::CompositorFrameAck& ack) override;
void DelegatedFrameHostOnLostCompositorResources() override;
-
- // BeginFrameObserverProxyClient implementation.
- void SendBeginFrame(const cc::BeginFrameArgs& args) override;
+ void DelegatedFrameHostUpdateVSyncParameters(
+ const base::TimeTicks& timebase,
+ const base::TimeDelta& interval) override;
// Detaches |this| from the input method object.
void DetachFromInputMethod();
@@ -497,9 +495,6 @@
// Helper function to set keyboard focus to the main window.
void SetKeyboardFocus();
-
- // Called when RenderWidget wants to start BeginFrame scheduling or stop.
- void OnSetNeedsBeginFrames(bool needs_begin_frames);
RenderFrameHostImpl* GetFocusedFrame();
@@ -675,8 +670,6 @@
// compositing surface and showing the disambiguation popup.
gfx::Vector2dF disambiguation_scroll_offset_;
- BeginFrameObserverProxy begin_frame_observer_proxy_;
-
base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
};

Powered by Google App Engine
This is Rietveld 408576698