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

Unified Diff: content/renderer/render_widget.cc

Issue 8344021: Use WebCompositor only when --enable-threaded-compositing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Dont create thread Created 9 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 | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 960fa49933998665f336e8b1172c1682d9403995..d5a27e1362007f2873bd169919d593a26fe6b4a2 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -925,8 +925,10 @@ void RenderWidget::didScrollRect(int dx, int dy, const WebRect& clip_rect) {
void RenderWidget::didActivateCompositor(int compositor_identifier) {
TRACE_EVENT0("gpu", "RenderWidget::didActivateCompositor");
- RenderThreadImpl::current()->compositor_thread()->
- AddCompositor(routing_id_, compositor_identifier);
+ CompositorThread* compositor_thread =
+ RenderThreadImpl::current()->compositor_thread();
+ if (compositor_thread)
jamesr 2011/10/20 22:51:52 in webkit we normally fold the assignment into the
darin (slow to review) 2011/10/21 05:03:35 I don't think there is a strong convention. It'd
+ compositor_thread->AddCompositor(routing_id_, compositor_identifier);
is_accelerated_compositing_active_ = true;
Send(new ViewHostMsg_DidActivateAcceleratedCompositing(
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698