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

Unified Diff: content/browser/renderer_host/browser_compositor_view_mac.mm

Issue 2776973002: DelegatedFrameHost should not create an ExternalBeginFrameSource (Closed)
Patch Set: c Created 3 years, 9 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/browser_compositor_view_mac.mm
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
index d76f0a192b9661d02ef2183b548b328e6fb2942d..cd9bf321a4ef55c560cc3a19bd771e4e0acf18bf 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.mm
+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -282,17 +282,13 @@ void BrowserCompositorMac::SwapCompositorFrame(
recyclable_compositor_->compositor()->SetScaleAndSize(scale_factor,
pixel_size);
}
- cc::BeginFrameAck ack(frame.metadata.begin_frame_ack);
delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id,
local_surface_id, std::move(frame));
- if (begin_frame_source_)
- begin_frame_source_->DidFinishFrame(this, ack);
}
void BrowserCompositorMac::OnBeginFrameDidNotSwap(
const cc::BeginFrameAck& ack) {
- if (begin_frame_source_)
- begin_frame_source_->DidFinishFrame(this, ack);
+ delegated_frame_host_->BeginFrameDidNotSwap(ack);
}
void BrowserCompositorMac::SetHasTransparentBackground(bool transparent) {
@@ -398,16 +394,7 @@ void BrowserCompositorMac::DisableRecyclingForShutdown() {
}
void BrowserCompositorMac::SetNeedsBeginFrames(bool needs_begin_frames) {
- if (needs_begin_frames_ == needs_begin_frames)
- return;
-
- needs_begin_frames_ = needs_begin_frames;
- if (begin_frame_source_) {
- if (needs_begin_frames_)
- begin_frame_source_->AddObserver(this);
- else
- begin_frame_source_->RemoveObserver(this);
- }
+ delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames);
}
////////////////////////////////////////////////////////////////////////////////
@@ -455,12 +442,8 @@ void BrowserCompositorMac::DelegatedFrameHostSendReclaimCompositorResources(
compositor_frame_sink_id, is_swap_ack, resources);
}
-void BrowserCompositorMac::SetBeginFrameSource(cc::BeginFrameSource* source) {
- if (begin_frame_source_ && needs_begin_frames_)
- begin_frame_source_->RemoveObserver(this);
- begin_frame_source_ = source;
- if (begin_frame_source_ && needs_begin_frames_)
- begin_frame_source_->AddObserver(this);
+void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) {
+ client_->BrowserCompositorMacSendBeginFrame(args);
}
bool BrowserCompositorMac::IsAutoResizeEnabled() const {
@@ -468,20 +451,4 @@ bool BrowserCompositorMac::IsAutoResizeEnabled() const {
return false;
}
-////////////////////////////////////////////////////////////////////////////////
-// cc::BeginFrameSourceBase, public:
-
-void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) {
- client_->BrowserCompositorMacSendBeginFrame(args);
- last_begin_frame_args_ = args;
-}
-
-const cc::BeginFrameArgs& BrowserCompositorMac::LastUsedBeginFrameArgs() const {
- return last_begin_frame_args_;
-}
-
-void BrowserCompositorMac::OnBeginFrameSourcePausedChanged(bool paused) {
- // Only used on Android WebView.
-}
-
} // namespace content
« no previous file with comments | « content/browser/renderer_host/browser_compositor_view_mac.h ('k') | content/browser/renderer_host/delegated_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698