Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)

New snapshot that should work with the latest Qt build system changes

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp b/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp
index d69e4bc45..678efdff0 100644
--- a/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp
+++ b/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp
@@ -52,7 +52,7 @@ CCSingleThreadProxy::CCSingleThreadProxy(CCLayerTreeHost* layerTreeHost)
     , m_layerRendererInitialized(false)
     , m_nextFrameIsNewlyCommittedFrame(false)
 {
-    TRACE_EVENT("CCSingleThreadProxy::CCSingleThreadProxy", this, 0);
+    TRACE_EVENT0("cc", "CCSingleThreadProxy::CCSingleThreadProxy");
     ASSERT(CCProxy::isMainThread());
 }
 
@@ -64,14 +64,14 @@ void CCSingleThreadProxy::start()
 
 CCSingleThreadProxy::~CCSingleThreadProxy()
 {
-    TRACE_EVENT("CCSingleThreadProxy::~CCSingleThreadProxy", this, 0);
+    TRACE_EVENT0("cc", "CCSingleThreadProxy::~CCSingleThreadProxy");
     ASSERT(CCProxy::isMainThread());
     ASSERT(!m_layerTreeHostImpl && !m_layerTreeHost); // make sure stop() got called.
 }
 
 bool CCSingleThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect)
 {
-    TRACE_EVENT("CCSingleThreadProxy::compositeAndReadback", this, 0);
+    TRACE_EVENT0("cc", "CCSingleThreadProxy::compositeAndReadback");
     ASSERT(CCProxy::isMainThread());
 
     if (!commitAndComposite())
@@ -255,7 +255,7 @@ void CCSingleThreadProxy::didAddAnimation()
 
 void CCSingleThreadProxy::stop()
 {
-    TRACE_EVENT("CCSingleThreadProxy::stop", this, 0);
+    TRACE_EVENT0("cc", "CCSingleThreadProxy::stop");
     ASSERT(CCProxy::isMainThread());
     {
         DebugScopedSetMainThreadBlocked mainThreadBlocked;