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

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

Issue 1931213002: display_compositor: Move CompositorOverlayCandidateValidator from content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DONE_2016.04.28_dc-overlay-candidate-validator
Patch Set: . Created 4 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
« no previous file with comments | « content/browser/compositor/reflector_impl_unittest.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index cee1d49461c5f474a5d9b3a5e834ea094d19f26c..d36ce66a71d5373c98ba48c2b883215785816d82 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -43,9 +43,9 @@
#include "cc/surfaces/surface_manager.h"
#include "cc/trees/layer_tree_host.h"
#include "cc/trees/layer_tree_settings.h"
+#include "components/display_compositor/compositor_overlay_candidate_validator_android.h"
#include "components/display_compositor/gl_helper.h"
#include "content/browser/android/child_process_launcher_android.h"
-#include "content/browser/compositor/browser_compositor_overlay_candidate_validator_android.h"
#include "content/browser/gpu/browser_gpu_channel_host_factory.h"
#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
#include "content/browser/gpu/compositor_util.h"
@@ -145,7 +145,8 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface,
base::Bind(&OutputSurfaceWithoutParent::OnSwapBuffersCompleted,
base::Unretained(this))),
overlay_candidate_validator_(
- new BrowserCompositorOverlayCandidateValidatorAndroid()),
+ new display_compositor::
+ CompositorOverlayCandidateValidatorAndroid()),
begin_frame_source_(std::move(begin_frame_source)) {
capabilities_.adjust_deadline_for_parent = false;
capabilities_.max_frames_pending = kMaxDisplaySwapBuffers;
« no previous file with comments | « content/browser/compositor/reflector_impl_unittest.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698