Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 14 insertions, 14 deletions

diff --git a/Source/WebKit/blackberry/WebKitSupport/RenderQueue.cpp b/Source/WebKit/blackberry/WebKitSupport/RenderQueue.cpp
index 110be1aa1..2da6d8e68 100644
--- a/Source/WebKit/blackberry/WebKitSupport/RenderQueue.cpp
+++ b/Source/WebKit/blackberry/WebKitSupport/RenderQueue.cpp
@@ -362,7 +362,7 @@ void RenderQueue::addToRegularQueue(const Platform::IntRect& rect)
 {
 #if DEBUG_RENDER_QUEUE
     if (m_regularRenderJobsRegion.isRectInRegion(rect) != Platform::IntRectRegion::ContainedInRegion) {
-        BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::addToRegularQueue %d,%d %dx%d",
+        BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::addToRegularQueue %d,%d %dx%d",
                                rect.x(), rect.y(), rect.width(), rect.height());
     }
 #endif
@@ -383,7 +383,7 @@ void RenderQueue::addToScrollZoomQueue(const RenderRect& rect, RenderRectList* r
         return;
 
 #if DEBUG_RENDER_QUEUE
-    BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::addToScrollZoomQueue %d,%d %dx%d",
+    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::addToScrollZoomQueue %d,%d %dx%d",
                            rect.x(), rect.y(), rect.width(), rect.height());
 #endif
     rectList->push_back(rect);
@@ -569,7 +569,7 @@ void RenderQueue::render(bool shouldPerformRegularRenderJobs)
 #if DEBUG_RENDER_QUEUE
     double elapsed = WTF::currentTime() - time;
     if (elapsed)
-        BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::render layout elapsed=%f", elapsed);
+        BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::render layout elapsed=%f", elapsed);
 #endif
 
     // Empty the queues in a precise order of priority.
@@ -599,7 +599,7 @@ void RenderQueue::renderAllCurrentRegularRenderJobs()
 #if DEBUG_RENDER_QUEUE
     double elapsed = WTF::currentTime() - time;
     if (elapsed)
-        BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs layout elapsed=%f", elapsed);
+        BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs layout elapsed=%f", elapsed);
 #endif
 
     // The state of render queue may be modified from inside requestLayoutIfNeeded.
@@ -626,7 +626,7 @@ void RenderQueue::renderAllCurrentRegularRenderJobs()
 
 #if DEBUG_RENDER_QUEUE
         if (!regionNotRendered.isEmpty())
-            BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs region not completely rendered!");
+            BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs region not completely rendered!");
 #endif
 
         // Clip to the visible contents so we'll be faster.
@@ -645,7 +645,7 @@ void RenderQueue::renderAllCurrentRegularRenderJobs()
     elapsed = WTF::currentTime() - time;
     Platform::IntRect extents = m_currentRegularRenderJobsBatchRegion.extents();
     int numberOfRects = m_currentRegularRenderJobsBatchRegion.rects().size();
-    BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs extents=(%d,%d %dx%d) numberOfRects=%d elapsed=%f",
+    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs extents=(%d,%d %dx%d) numberOfRects=%d elapsed=%f",
                            extents.x(), extents.y(), extents.width(), extents.height(), numberOfRects, elapsed);
 #endif
 
@@ -681,7 +681,7 @@ void RenderQueue::startRegularRenderJobBatchIfNeeded()
     m_regularRenderJobsRegion = Platform::IntRectRegion();
 
 #if DEBUG_RENDER_QUEUE
-    BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::startRegularRenderJobBatchIfNeeded batch size is %d!", m_currentRegularRenderJobsBatch.size());
+    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::startRegularRenderJobBatchIfNeeded batch size is %d!", m_currentRegularRenderJobsBatch.size());
 #endif
 }
 
@@ -708,7 +708,7 @@ void RenderQueue::renderVisibleZoomJob()
 #if DEBUG_RENDER_QUEUE
     // Stop the time measurement
     double elapsed = WTF::currentTime() - time;
-    BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleZoomJob rect=(%d,%d %dx%d) elapsed=%f",
+    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleZoomJob rect=(%d,%d %dx%d) elapsed=%f",
                            subRect.x(), subRect.y(), subRect.width(), subRect.height(), elapsed);
 #endif
 }
@@ -727,7 +727,7 @@ void RenderQueue::renderVisibleScrollJob()
 #if DEBUG_RENDER_QUEUE_SORT
     // Stop the time measurement
     double elapsed = WTF::currentTime() - time;
-    BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleScrollJob sort elapsed=%f", elapsed);
+    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleScrollJob sort elapsed=%f", elapsed);
 #endif
 
     RenderRect rect = m_visibleScrollJobs[0];
@@ -748,7 +748,7 @@ void RenderQueue::renderVisibleScrollJob()
 #if DEBUG_RENDER_QUEUE
     // Stop the time measurement
     double elapsed = WTF::currentTime() - time;
-    BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleScrollJob rect=(%d,%d %dx%d) elapsed=%f",
+    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleScrollJob rect=(%d,%d %dx%d) elapsed=%f",
                            subRect.x(), subRect.y(), subRect.width(), subRect.height(), elapsed);
 #endif
 
@@ -780,7 +780,7 @@ void RenderQueue::renderRegularRenderJob()
 
 #if DEBUG_RENDER_QUEUE
         if (!regionNotRendered.isEmpty()) {
-            BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderRegularRenderJob rect (%d,%d %dx%d) not completely rendered!",
+            BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderRegularRenderJob rect (%d,%d %dx%d) not completely rendered!",
                                   rect.x(), rect.y(), rect.width(), rect.height());
         }
 #endif
@@ -795,7 +795,7 @@ void RenderQueue::renderRegularRenderJob()
 #if DEBUG_RENDER_QUEUE
     // Stop the time measurement.
     double elapsed = WTF::currentTime() - time;
-    BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderRegularRenderJob rect=(%d,%d %dx%d) elapsed=%f",
+    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderRegularRenderJob rect=(%d,%d %dx%d) elapsed=%f",
                            rect.x(), rect.y(), rect.width(), rect.height(), elapsed);
 #endif
 
@@ -829,7 +829,7 @@ void RenderQueue::renderNonVisibleScrollJob()
 #if DEBUG_RENDER_QUEUE_SORT
     // Stop the time measurement.
     double elapsed = WTF::currentTime() - time;
-    BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderNonVisibleScrollJob sort elapsed=%f", elapsed);
+    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderNonVisibleScrollJob sort elapsed=%f", elapsed);
 #endif
 
     RenderRect rect = m_nonVisibleScrollJobs[0];
@@ -854,7 +854,7 @@ void RenderQueue::renderNonVisibleScrollJob()
 #if DEBUG_RENDER_QUEUE
     // Stop the time measurement.
     double elapsed = WTF::currentTime() - time;
-    BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderNonVisibleScrollJob rect=(%d,%d %dx%d) elapsed=%f",
+    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderNonVisibleScrollJob rect=(%d,%d %dx%d) elapsed=%f",
                            subRect.x(), subRect.y(), subRect.width(), subRect.height(), elapsed);
 #endif