Merge 165866 - Disable threaded compositing when texture sharing is blacklisted

webkit/compositor_bindings/web_compositor_support_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "webkit/compositor_bindings/web_compositor_support_impl.h"
 
+#include "base/debug/trace_event.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/settings.h"
 #include "webkit/compositor_bindings/web_animation_impl.h"
 #include "webkit/compositor_bindings/web_compositor_impl.h"
 #include "webkit/compositor_bindings/web_content_layer_impl.h"
 #include "webkit/compositor_bindings/web_delegated_renderer_layer_impl.h"
 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h"
 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
 #include "webkit/compositor_bindings/web_image_layer_impl.h"
 #include "webkit/compositor_bindings/web_io_surface_layer_impl.h"
@@ skipping 31 matching lines @@
 
 namespace webkit {
 
 WebCompositorSupportImpl::WebCompositorSupportImpl() {
 }
 
 WebCompositorSupportImpl::~WebCompositorSupportImpl() {
 }
 
 void WebCompositorSupportImpl::initialize(WebKit::WebThread* thread) {
+  if (thread) {
+    TRACE_EVENT_INSTANT0("test_gpu", "ThreadedCompositingInitialization");
+  }
   WebCompositorImpl::initialize(thread);
 }
 
 bool WebCompositorSupportImpl::isThreadingEnabled() {
   return WebCompositorImpl::isThreadingEnabled();
 }
 
 void WebCompositorSupportImpl::shutdown() {
   WebCompositorImpl::shutdown();
 }
@@ skipping 79 matching lines @@
 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() {
   return new WebKit::WebFloatAnimationCurveImpl();
 }
 
 WebTransformAnimationCurve*
     WebCompositorSupportImpl::createTransformAnimationCurve() {
   return new WebKit::WebTransformAnimationCurveImpl();
 }
 
 }  // namespace webkit