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

Unified Diff: content/renderer/render_view_impl.cc

Issue 11293121: Add latency measurement system (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: create cc::LatencyInfo Created 7 years, 12 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/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 4666171811be133a169cf31da870b7b16c5347fd..52270efde30372ae5beda7ed919f3fee19560e77 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1890,6 +1890,7 @@ WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace(
}
WebKit::WebCompositorOutputSurface* RenderViewImpl::createOutputSurface() {
+ CommandBufferProxyImpl* proxy = NULL;
// Explicitly disable antialiasing for the compositor. As of the time of
// this writing, the only platform that supported antialiasing for the
// compositor was Mac OS X, because the on-screen OpenGL context creation
@@ -1904,7 +1905,7 @@ WebKit::WebCompositorOutputSurface* RenderViewImpl::createOutputSurface() {
attributes.antialias = false;
attributes.shareResources = true;
attributes.noAutomaticFlushes = true;
- WebGraphicsContext3D* context = CreateGraphicsContext3D(attributes);
+ WebGraphicsContext3D* context = CreateGraphicsContext3D(attributes, &proxy);
if (!context)
return NULL;
@@ -1913,10 +1914,10 @@ WebKit::WebCompositorOutputSurface* RenderViewImpl::createOutputSurface() {
// In the absence of a software-based delegating renderer, use this
// stopgap adapter class to present the software renderer output using a
// 3d context.
- return new CompositorOutputSurface(routing_id(), NULL,
+ return new CompositorOutputSurface(routing_id(), NULL, NULL,
new CompositorSoftwareOutputDeviceGLAdapter(context));
} else
- return new CompositorOutputSurface(routing_id(), context, NULL);
+ return new CompositorOutputSurface(routing_id(), context, proxy, NULL);
}
void RenderViewImpl::didAddMessageToConsole(
@@ -3877,7 +3878,9 @@ void RenderViewImpl::CheckPreferredSize() {
}
WebGraphicsContext3D* RenderViewImpl::CreateGraphicsContext3D(
- const WebGraphicsContext3D::Attributes& attributes) {
+ const WebGraphicsContext3D::Attributes& attributes,
+ CommandBufferProxyImpl** proxy) {
+ *proxy = NULL;
if (!webview())
return NULL;
@@ -3906,6 +3909,7 @@ WebGraphicsContext3D* RenderViewImpl::CreateGraphicsContext3D(
false /* bind generates resources */,
CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE))
return NULL;
+ *proxy = context->GetCommandBufferProxy();
return context.release();
}
}
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698