| Index: Source/WebCore/rendering/RenderLayerCompositor.cpp
|
| diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
|
| index 3a85f41cc161e94f9ac668d6df61a3aa46f522b5..88064a5fefbc61db041266fb8f3e810daaca3bd1 100644
|
| --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
|
| +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
|
| @@ -534,7 +534,7 @@ void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType update
|
|
|
| Frame* frame = m_renderView->frameView()->frame();
|
| bool isMainFrame = !m_renderView->document()->ownerElement();
|
| - LOG(Compositing, "\nUpdate %d of %s. Overlap testing is %s\n", m_rootLayerUpdateCount, isMainFrame ? "main frame" : frame->tree()->uniqueName().string().utf8().data(),
|
| + LOG_INFO(Compositing, "\nUpdate %d of %s. Overlap testing is %s\n", m_rootLayerUpdateCount, isMainFrame ? "main frame" : frame->tree()->uniqueName().string().utf8().data(),
|
| m_compositingConsultsOverlap ? "on" : "off");
|
| }
|
| #endif
|
| @@ -562,11 +562,11 @@ void RenderLayerCompositor::updateCompositingLayers(CompositingUpdateType update
|
| #if !LOG_DISABLED
|
| if (compositingLogEnabled() && isFullUpdate && (needHierarchyUpdate || needGeometryUpdate)) {
|
| double endTime = currentTime();
|
| - LOG(Compositing, "Total layers primary secondary obligatory backing (KB) secondary backing(KB) total backing (KB) update time (ms)\n");
|
| + LOG_INFO(Compositing, "Total layers primary secondary obligatory backing (KB) secondary backing(KB) total backing (KB) update time (ms)\n");
|
|
|
| - LOG(Compositing, "%8d %11d %9d %20.2f %22.2f %22.2f %18.2f\n",
|
| - m_obligateCompositedLayerCount + m_secondaryCompositedLayerCount, m_obligateCompositedLayerCount,
|
| - m_secondaryCompositedLayerCount, m_obligatoryBackingStoreBytes / 1024, m_secondaryBackingStoreBytes / 1024, (m_obligatoryBackingStoreBytes + m_secondaryBackingStoreBytes) / 1024, 1000.0 * (endTime - startTime));
|
| + LOG_INFO(Compositing, "%8d %11d %9d %20.2f %22.2f %22.2f %18.2f\n",
|
| + m_obligateCompositedLayerCount + m_secondaryCompositedLayerCount, m_obligateCompositedLayerCount,
|
| + m_secondaryCompositedLayerCount, m_obligatoryBackingStoreBytes / 1024, m_secondaryBackingStoreBytes / 1024, (m_obligatoryBackingStoreBytes + m_secondaryBackingStoreBytes) / 1024, 1000.0 * (endTime - startTime));
|
| }
|
| #endif
|
| ASSERT(updateRoot || !m_compositingLayersNeedRebuild);
|
| @@ -602,9 +602,9 @@ void RenderLayerCompositor::logLayerInfo(const RenderLayer* layer, int depth)
|
| m_secondaryBackingStoreBytes += backing->backingStoreMemoryEstimate();
|
| }
|
|
|
| - LOG(Compositing, "%*p %dx%d %.2fKB (%s) %s\n", 12 + depth * 2, layer, backing->compositedBounds().width(), backing->compositedBounds().height(),
|
| - backing->backingStoreMemoryEstimate() / 1024,
|
| - logReasonsForCompositing(layer), layer->name().utf8().data());
|
| + LOG_INFO(Compositing, "%*p %dx%d %.2fKB (%s) %s\n", 12 + depth * 2, layer, backing->compositedBounds().width(), backing->compositedBounds().height(),
|
| + backing->backingStoreMemoryEstimate() / 1024,
|
| + logReasonsForCompositing(layer), layer->name().utf8().data());
|
| }
|
| #endif
|
|
|
|
|