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

Unified Diff: ui/gfx/compositor/compositor.cc

Issue 9122020: Update CompositorCC WebLayerTreeView usage for WebKit API change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to ToT Created 8 years, 10 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 | « ui/gfx/compositor/compositor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor.cc
diff --git a/ui/gfx/compositor/compositor.cc b/ui/gfx/compositor/compositor.cc
index 7d8abdfef62fca23266d5c9eda7f047fab6a202e..506b0ca8f18950219a53ac50cedd2311ce1548f2 100644
--- a/ui/gfx/compositor/compositor.cc
+++ b/ui/gfx/compositor/compositor.cc
@@ -128,7 +128,11 @@ Compositor::Compositor(CompositorDelegate* delegate,
command_line->HasSwitch(switches::kUIEnablePerTilePainting);
#endif
+#if defined(WEBLAYERTREEVIEW_HAS_INITIALIZE)
+ host_.initialize(this, root_web_layer_, settings);
+#else
host_ = WebKit::WebLayerTreeView::create(this, root_web_layer_, settings);
+#endif
root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
WidgetSizeChanged(size_);
}
@@ -278,11 +282,14 @@ WebKit::WebGraphicsContext3D* Compositor::createContext3D() {
}
}
-void Compositor::didCompleteSwapBuffers() {
- NotifyEnd();
+void Compositor::didRebindGraphicsContext(bool success) {
}
-void Compositor::didRebindGraphicsContext(bool success) {
+void Compositor::didCommitAndDrawFrame() {
+}
+
+void Compositor::didCompleteSwapBuffers() {
+ NotifyEnd();
}
void Compositor::scheduleComposite() {
« no previous file with comments | « ui/gfx/compositor/compositor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698