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

Unified Diff: ui/aura/window.cc

Issue 2868473002: Implement aura::Window::CreateCompositorFrameSink() (Closed)
Patch Set: Address review issues Created 3 years, 7 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: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index e38a63af9980b68cf5ddb83a0497630ec2139bbf..1da47ce0d4af6909b13aa1b346a909cc6d4ec365 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -18,6 +18,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+#include "cc/output/compositor_frame_sink.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/cursor_client.h"
@@ -28,11 +29,11 @@
#include "ui/aura/client/window_stacking_client.h"
#include "ui/aura/env.h"
#include "ui/aura/layout_manager.h"
+#include "ui/aura/local/compositor_frame_sink_local.h"
#include "ui/aura/window_delegate.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_observer.h"
#include "ui/aura/window_port.h"
-#include "ui/aura/window_port_local.h"
#include "ui/aura/window_tracker.h"
#include "ui/aura/window_tree_host.h"
#include "ui/compositor/compositor.h"
@@ -856,9 +857,11 @@ void Window::NotifyRemovingFromRootWindow(Window* new_root) {
it != children_.end(); ++it) {
(*it)->NotifyRemovingFromRootWindow(new_root);
}
+ port_->OnWindowRemovingFromRootWindow();
sky 2017/05/08 22:36:43 I have a mild preferences for calling this before
Peng 2017/05/09 17:26:57 Done.
}
void Window::NotifyAddedToRootWindow() {
+ port_->OnWindowAddedToRootWindow();
for (WindowObserver& observer : observers_)
observer.OnWindowAddedToRootWindow(this);
for (Window::Windows::const_iterator it = children_.begin();
@@ -988,6 +991,14 @@ bool Window::CleanupGestureState() {
return state_modified;
}
+std::unique_ptr<cc::CompositorFrameSink> Window::CreateCompositorFrameSink() {
+ return port_->CreateCompositorFrameSink();
+}
+
+cc::SurfaceId Window::GetSurfaceId() const {
+ return port_->GetSurfaceId();
+}
+
void Window::OnPaintLayer(const ui::PaintContext& context) {
Paint(context);
}

Powered by Google App Engine
This is Rietveld 408576698