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

Unified Diff: blimp/client/support/compositor/blimp_embedder_compositor.cc

Issue 2374183006: Remove GLFrameData from CompositorFrame. (Closed)
Patch Set: Rebase. 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
« no previous file with comments | « android_webview/browser/parent_output_surface.cc ('k') | cc/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/support/compositor/blimp_embedder_compositor.cc
diff --git a/blimp/client/support/compositor/blimp_embedder_compositor.cc b/blimp/client/support/compositor/blimp_embedder_compositor.cc
index 0e41f74d91dc633107c7892bd364e6bd69c9a482..066fda089a1e928efcf38dd6754e8ffcb950410e 100644
--- a/blimp/client/support/compositor/blimp_embedder_compositor.cc
+++ b/blimp/client/support/compositor/blimp_embedder_compositor.cc
@@ -11,8 +11,8 @@
#include "blimp/client/support/compositor/blimp_context_provider.h"
#include "cc/animation/animation_host.h"
#include "cc/layers/layer.h"
-#include "cc/output/compositor_frame.h"
#include "cc/output/output_surface.h"
+#include "cc/output/output_surface_frame.h"
#include "cc/output/texture_mailbox_deleter.h"
#include "cc/raster/single_thread_task_graph_runner.h"
#include "cc/surfaces/direct_compositor_frame_sink.h"
@@ -54,7 +54,7 @@ class DisplayOutputSurface : public cc::OutputSurface {
void BindFramebuffer() override {
context_provider()->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
}
- void SwapBuffers(cc::CompositorFrame frame) override {
+ void SwapBuffers(cc::OutputSurfaceFrame frame) override {
// See cc::OutputSurface::SwapBuffers() comment for details.
context_provider_->ContextSupport()->Swap();
cc::OutputSurface::PostSwapBuffersComplete();
« no previous file with comments | « android_webview/browser/parent_output_surface.cc ('k') | cc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698