Changeset 131335 in webkit


Ignore:
Timestamp:
Oct 15, 2012, 12:35:20 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

[BlackBerry] replace BlackBerry::Platform::log() with BBLOG()
​https://bugs.webkit.org/show_bug.cgi?id=99302

Patch by Jonathan Dong <Jonathan Dong> on 2012-10-15
Reviewed by Rob Buis.

RIM PR: 210884
The marco BBLOG() is defined as a no-op in release mode which will
save a function call in the release build.
Internally reviewed by Charles Wei.

Source/WebCore:

No new tests since there's no functional change.

  • platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:

(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):

  • platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:

(WebCore::GraphicsContext3D::logFrameBufferStatus):

  • platform/graphics/blackberry/LayerCompositingThread.cpp:

(WebCore::LayerCompositingThread::getTransformedHolePunchRect):

  • platform/graphics/blackberry/VideoLayerWebKitThread.cpp:

(WebCore::VideoLayerWebKitThread::setHolePunchRect):
(WebCore::VideoLayerWebKitThread::boundsChanged):

  • platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:

(WebCore::GraphicsContext3D::compileShader):

Source/WebKit/blackberry:

  • Api/BackingStore.cpp:

(BlackBerry::WebKit::bestDivisor):
(BlackBerry::WebKit::BackingStorePrivate::suspendScreenAndBackingStoreUpdates):
(BlackBerry::WebKit::BackingStorePrivate::resumeScreenAndBackingStoreUpdates):
(BlackBerry::WebKit::BackingStorePrivate::repaint):
(BlackBerry::WebKit::BackingStorePrivate::slowScroll):
(BlackBerry::WebKit::BackingStorePrivate::scroll):
(BlackBerry::WebKit::BackingStorePrivate::setBackingStoreRect):
(BlackBerry::WebKit::BackingStorePrivate::scrollBackingStore):
(BlackBerry::WebKit::BackingStorePrivate::render):
(BlackBerry::WebKit::BackingStorePrivate::blitVisibleContents):
(BlackBerry::WebKit::BackingStorePrivate::updateTilesForScrollOrNotRenderedRegion):
(BlackBerry::WebKit::BackingStorePrivate::renderContents):
(BlackBerry::WebKit::BackingStorePrivate::blitToWindow):
(BlackBerry::WebKit::BackingStorePrivate::fillWindow):
(BlackBerry::WebKit::BackingStorePrivate::invalidateWindow):
(BlackBerry::WebKit::BackingStorePrivate::clearWindow):

  • Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::setLoadState):
(BlackBerry::WebKit::WebPagePrivate::zoomAboutPoint):
(BlackBerry::WebKit::WebPagePrivate::contentsSizeChanged):
(BlackBerry::WebKit::WebPagePrivate::zoomToInitialScaleOnLoad):
(BlackBerry::WebKit::WebPagePrivate::scheduleRootLayerCommit):
(BlackBerry::WebKit::WebPagePrivate::commitRootLayer):
(BlackBerry::WebKit::WebPagePrivate::commitRootLayerIfNeeded):
(BlackBerry::WebKit::WebPagePrivate::rootLayerCommitTimerFired):

  • WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore::ChromeClientBlackBerry::overflowExceedsContentsSize):
(WebCore::ChromeClientBlackBerry::didDiscoverFrameSet):

  • WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::dispatchDidLayout):

  • WebKitSupport/FatFingers.cpp:

(BlackBerry::WebKit::FatFingers::checkFingerIntersection):
(BlackBerry::WebKit::FatFingers::findIntersectingRegions):
(BlackBerry::WebKit::FatFingers::checkForText):

  • WebKitSupport/RenderQueue.cpp:

(BlackBerry::WebKit::RenderQueue::addToRegularQueue):
(BlackBerry::WebKit::RenderQueue::addToScrollZoomQueue):
(BlackBerry::WebKit::RenderQueue::render):
(BlackBerry::WebKit::RenderQueue::renderAllCurrentRegularRenderJobs):
(BlackBerry::WebKit::RenderQueue::startRegularRenderJobBatchIfNeeded):
(BlackBerry::WebKit::RenderQueue::renderVisibleZoomJob):
(BlackBerry::WebKit::RenderQueue::renderVisibleScrollJob):
(BlackBerry::WebKit::RenderQueue::renderRegularRenderJob):
(BlackBerry::WebKit::RenderQueue::renderNonVisibleScrollJob):

  • WebKitSupport/SurfacePool.cpp:

(BlackBerry::WebKit::SurfacePool::initialize):

Location:
trunk/Source
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r131333 r131335  
     12012-10-15  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
     2
     3        [BlackBerry] replace BlackBerry::Platform::log() with BBLOG()
     4        https://bugs.webkit.org/show_bug.cgi?id=99302
     5
     6        Reviewed by Rob Buis.
     7
     8        RIM PR: 210884
     9        The marco BBLOG() is defined as a no-op in release mode which will
     10        save a function call in the release build.
     11        Internally reviewed by Charles Wei.
     12
     13        No new tests since there's no functional change.
     14
     15        * platform/blackberry/PlatformKeyboardEventBlackBerry.cpp:
     16        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
     17        * platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:
     18        (WebCore::GraphicsContext3D::logFrameBufferStatus):
     19        * platform/graphics/blackberry/LayerCompositingThread.cpp:
     20        (WebCore::LayerCompositingThread::getTransformedHolePunchRect):
     21        * platform/graphics/blackberry/VideoLayerWebKitThread.cpp:
     22        (WebCore::VideoLayerWebKitThread::setHolePunchRect):
     23        (WebCore::VideoLayerWebKitThread::boundsChanged):
     24        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
     25        (WebCore::GraphicsContext3D::compileShader):
     26
    1272012-10-15  Christophe Dumez  <christophe.dumez@intel.com>
    228

  • trunk/Source/WebCore/platform/blackberry/PlatformKeyboardEventBlackBerry.cpp

    r127613 r131335  
    453453        m_modifiers |= ShiftKey; // BackTab should be treated as Shift + Tab.
    454454
    455     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "Keyboard event received text=%lc, keyIdentifier=%s, windowsVirtualKeyCode=%d", event.character(), m_keyIdentifier.latin1().data(), m_windowsVirtualKeyCode);
     455    BBLOG(BlackBerry::Platform::LogLevelInfo, "Keyboard event received text=%lc, keyIdentifier=%s, windowsVirtualKeyCode=%d", event.character(), m_keyIdentifier.latin1().data(), m_windowsVirtualKeyCode);
    456456}
    457457

  • trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp

    r130801 r131335  
    235235void GraphicsContext3D::logFrameBufferStatus(int line)
    236236{
    237     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "Checking FrameBuffer status at line %d: ", line);
     237    BBLOG(BlackBerry::Platform::LogLevelInfo, "Checking FrameBuffer status at line %d: ", line);
    238238    switch (glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)) {
    239239    case GL_FRAMEBUFFER_COMPLETE:
    240         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "COMPLETE | ");
     240        BBLOG(BlackBerry::Platform::LogLevelInfo, "COMPLETE | ");
    241241        break;
    242242    case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
    243         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "INCOMPLETE ATTACHMENT | ");
     243        BBLOG(BlackBerry::Platform::LogLevelInfo, "INCOMPLETE ATTACHMENT | ");
    244244        break;
    245245    case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
    246         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "MISSING ATTACHMENT | ");
     246        BBLOG(BlackBerry::Platform::LogLevelInfo, "MISSING ATTACHMENT | ");
    247247        break;
    248248    case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
    249         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "INCOMPLETE DIMENSIONS | ");
     249        BBLOG(BlackBerry::Platform::LogLevelInfo, "INCOMPLETE DIMENSIONS | ");
    250250        break;
    251251    case GL_FRAMEBUFFER_UNSUPPORTED:
    252         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "UNSUPPORTED | ");
     252        BBLOG(BlackBerry::Platform::LogLevelInfo, "UNSUPPORTED | ");
    253253        break;
    254254    case FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT:
    255         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "INCOMPLETE MULTISAMPLE | ");
     255        BBLOG(BlackBerry::Platform::LogLevelInfo, "INCOMPLETE MULTISAMPLE | ");
    256256        break;
    257257    }
    … …  
    259259    switch (glGetError()) {
    260260    case GL_NO_ERROR:
    261         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "NO ERROR");
     261        BBLOG(BlackBerry::Platform::LogLevelInfo, "NO ERROR");
    262262        break;
    263263    case GL_INVALID_ENUM:
    264         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "INVALID ENUM");
     264        BBLOG(BlackBerry::Platform::LogLevelInfo, "INVALID ENUM");
    265265        break;
    266266    case GL_INVALID_VALUE:
    267         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "INVALID VALUE");
     267        BBLOG(BlackBerry::Platform::LogLevelInfo, "INVALID VALUE");
    268268        break;
    269269    case GL_INVALID_OPERATION:
    270         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "INVALID OPERATION");
     270        BBLOG(BlackBerry::Platform::LogLevelInfo, "INVALID OPERATION");
    271271        break;
    272272    case GL_OUT_OF_MEMORY:
    273         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "OUT OF MEMORY");
    274         break;
    275     }
    276     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "\n");
     273        BBLOG(BlackBerry::Platform::LogLevelInfo, "OUT OF MEMORY");
     274        break;
     275    }
     276    BBLOG(BlackBerry::Platform::LogLevelInfo, "\n");
    277277}
    278278

  • trunk/Source/WebCore/platform/graphics/blackberry/LayerCompositingThread.cpp

    r127502 r131335  
    198198
    199199#if DEBUG_VIDEO_CLIPPING
    200      IntRect drawRectInWebKitDocumentCoordination = m_layerRenderer->toWebKitDocumentCoordinates(m_drawRect);
    201      BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "LayerCompositingThread::getTransformedHolePunchRect() - drawRect=(x=%d,y=%d,width=%d,height=%d) clipRect=(x=%d,y=%d,width=%d,height=%d) clippedRect=(x=%d,y=%d,width=%d,height=%d).",
     200    IntRect drawRectInWebKitDocumentCoordination = m_layerRenderer->toWebKitDocumentCoordinates(m_drawRect);
     201    BBLOG(BlackBerry::Platform::LogLevelInfo, "LayerCompositingThread::getTransformedHolePunchRect() - drawRect=(x=%d,y=%d,width=%d,height=%d) clipRect=(x=%d,y=%d,width=%d,height=%d) clippedRect=(x=%d,y=%d,width=%d,height=%d).",
    202202        drawRectInWebKitDocumentCoordination.x(), drawRectInWebKitDocumentCoordination.y(), drawRectInWebKitDocumentCoordination.width(), drawRectInWebKitDocumentCoordination.height(),
    203203        m_holePunchClipRect.x(), m_holePunchClipRect.y(), m_holePunchClipRect.width(), m_holePunchClipRect.height(),

  • trunk/Source/WebCore/platform/graphics/blackberry/VideoLayerWebKitThread.cpp

    r109668 r131335  
    6666    m_holePunchRect = rect;
    6767#if DEBUG_VIDEO_CLIPPING
    68     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "VideoLayerWebKitThread m_holePunchRect=(x=%d,y=%d,width=%d,height=%d).", m_holePunchRect.x(), m_holePunchRect.y(), m_holePunchRect.width(), m_holePunchRect.height());
     68    BBLOG(BlackBerry::Platform::LogLevelInfo, "VideoLayerWebKitThread m_holePunchRect=(x=%d,y=%d,width=%d,height=%d).", m_holePunchRect.x(), m_holePunchRect.y(), m_holePunchRect.width(), m_holePunchRect.height());
    6969#endif
    7070    setNeedsCommit();
    … …  
    9696
    9797#if DEBUG_VIDEO_CLIPPING
    98     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "VideoLayerWebKitThread m_holePunchClipRect=(x=%d,y=%d,width=%d,height=%d).", m_holePunchClipRect.x(), m_holePunchClipRect.y(), m_holePunchClipRect.width(), m_holePunchClipRect.height());
     98    BBLOG(BlackBerry::Platform::LogLevelInfo, "VideoLayerWebKitThread m_holePunchClipRect=(x=%d,y=%d,width=%d,height=%d).", m_holePunchClipRect.x(), m_holePunchClipRect.y(), m_holePunchClipRect.width(), m_holePunchClipRect.height());
    9999#endif
    100100}

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

    r130985 r131335  
    480480#if PLATFORM(BLACKBERRY)
    481481    if (GLCompileSuccess != GL_TRUE)
    482         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelWarn, "The shader validated, but didn't compile.\n");
     482        BBLOG(BlackBerry::Platform::LogLevelWarn, "The shader validated, but didn't compile.\n");
    483483#endif
    484484}

  • trunk/Source/WebKit/blackberry/Api/BackingStore.cpp

    r131257 r131335  
    141141            bestDivisor = divisor; // Found a perfect fit!
    142142#if DEBUG_TILEMATRIX
    143             BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "bestDivisor found perfect size isPerfectWidth=%s isPerfectHeight=%s",
     143            BBLOG(BlackBerry::Platform::LogLevelCritical, "bestDivisor found perfect size isPerfectWidth=%s isPerfectHeight=%s",
    144144                                   isPerfectWidth ? "true" : "false",
    145145                                   isPerfectHeight ? "true" : "false");
    … …  
    282282{
    283283    if (m_suspendScreenUpdates) {
    284         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo,
     284        BBLOG(BlackBerry::Platform::LogLevelInfo,
    285285            "Screen and backingstore already suspended, increasing suspend counter.");
    286286    }
    … …  
    316316
    317317    if (m_suspendScreenUpdates >= 2 && m_suspendBackingStoreUpdates >= 2) { // we're still suspended
    318         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo,
     318        BBLOG(BlackBerry::Platform::LogLevelInfo,
    319319            "Screen and backingstore still suspended, decreasing suspend counter.");
    320320        --m_suspendBackingStoreUpdates;
    … …  
    395395
    396396#if DEBUG_WEBCORE_REQUESTS
    397         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical,
     397        BBLOG(BlackBerry::Platform::LogLevelCritical,
    398398                                  "BackingStorePrivate::repaint rect=%d,%d %dx%d contentChanged=%s immediate=%s",
    399399                                  rect.x(), rect.y(), rect.width(), rect.height(),
    … …  
    442442    // Stop the time measurement.
    443443    double elapsed = WTF::currentTime() - time;
    444     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::slowScroll elapsed=%f", elapsed);
     444    BBLOG(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::slowScroll elapsed=%f", elapsed);
    445445#endif
    446446}
    … …  
    475475    // Stop the time measurement.
    476476    double elapsed = WTF::currentTime() - time;
    477     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::scroll dx=%d, dy=%d elapsed=%f", delta.width(), delta.height(), elapsed);
     477    BBLOG(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::scroll dx=%d, dy=%d elapsed=%f", delta.width(), delta.height(), elapsed);
    478478#endif
    479479}
    … …  
    706706
    707707#if DEBUG_TILEMATRIX
    708     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::setBackingStoreRect changed from (%d,%d %dx%d) to (%d,%d %dx%d)",
     708    BBLOG(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::setBackingStoreRect changed from (%d,%d %dx%d) to (%d,%d %dx%d)",
    709709                           currentBackingStoreRect.x(),
    710710                           currentBackingStoreRect.y(),
    … …  
    760760#if DEBUG_BACKINGSTORE
    761761                Platform::IntRect extents = tileNotRenderedRegion.extents();
    762                 BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::setBackingStoreRect did clear tile %d,%d %dx%d",
     762                BBLOG(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::setBackingStoreRect did clear tile %d,%d %dx%d",
    763763                                       extents.x(), extents.y(), extents.width(), extents.height());
    764764#endif
    … …  
    970970
    971971#if DEBUG_TILEMATRIX
    972     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::scrollBackingStore divisor %dx%d",
     972    BBLOG(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::scrollBackingStore divisor %dx%d",
    973973                           divisor.first,
    974974                           divisor.second);
    … …  
    10421042
    10431043#if DEBUG_BACKINGSTORE
    1044     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical,
     1044    BBLOG(BlackBerry::Platform::LogLevelCritical,
    10451045                           "BackingStorePrivate::render rect=(%d,%d %dx%d), m_suspendBackingStoreUpdates = %s",
    10461046                           rect.x(), rect.y(), rect.width(), rect.height(),
    … …  
    15141514    if (blitCheckered && !lastCheckeredTime) {
    15151515        lastCheckeredTime = WTF::currentTime();
    1516         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical,
     1516        BBLOG(BlackBerry::Platform::LogLevelCritical,
    15171517            "Blitting checkered pattern at %f\n", lastCheckeredTime);
    15181518    } else if (blitCheckered && lastCheckeredTime) {
    1519         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical,
     1519        BBLOG(BlackBerry::Platform::LogLevelCritical,
    15201520            "Blitting checkered pattern at %f\n", WTF::currentTime());
    15211521    } else if (!blitCheckered && lastCheckeredTime) {
    15221522        double time = WTF::currentTime();
    1523         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical,
     1523        BBLOG(BlackBerry::Platform::LogLevelCritical,
    15241524            "Blitting over checkered pattern at %f took %f\n", time, time - lastCheckeredTime);
    15251525        lastCheckeredTime = 0;
    … …  
    18001800#if DEBUG_BACKINGSTORE
    18011801                Platform::IntRect extents = tileNotRenderedRegion.extents();
    1802                 BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical,
     1802                BBLOG(BlackBerry::Platform::LogLevelCritical,
    18031803                    "BackingStorePrivate::updateTilesForScroll did clear tile %d,%d %dx%d",
    18041804                    extents.x(), extents.y(), extents.width(), extents.height());
    … …  
    21932193
    21942194#if DEBUG_BACKINGSTORE
    2195     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical,
     2195    BBLOG(BlackBerry::Platform::LogLevelCritical,
    21962196                           "BackingStorePrivate::renderContents tileBuffer=0x%x surfaceOffset=(%d,%d) contentsRect=(%d,%d %dx%d)",
    21972197                           tileBuffer, surfaceOffset.x(), surfaceOffset.y(),
    … …  
    23292329    ASSERT(srcBuffer);
    23302330    if (!dstBuffer)
    2331         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelWarn, "Empty window buffer, couldn't blitToWindow");
     2331        BBLOG(BlackBerry::Platform::LogLevelWarn, "Empty window buffer, couldn't blitToWindow");
    23322332
    23332333    BlackBerry::Platform::Graphics::BlendMode blendMode = blend
    … …  
    23582358    ASSERT(dstBuffer);
    23592359    if (!dstBuffer)
    2360         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelWarn, "Empty window buffer, couldn't fillWindow");
     2360        BBLOG(BlackBerry::Platform::LogLevelWarn, "Empty window buffer, couldn't fillWindow");
    23612361
    23622362    BlackBerry::Platform::Graphics::fillBuffer(dstBuffer, pattern, dstRect, contentsOrigin, contentsScale);
    … …  
    23882388
    23892389#if DEBUG_BACKINGSTORE
    2390     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::invalidateWindow dst = %s", dst.toString().c_str());
     2390    BBLOG(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::invalidateWindow dst = %s", dst.toString().c_str());
    23912391#endif
    23922392
    … …  
    24082408
    24092409#if DEBUG_BACKINGSTORE
    2410     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::invalidateWindow posting = %s", dstRect.toString().c_str());
     2410    BBLOG(BlackBerry::Platform::LogLevelCritical, "BackingStorePrivate::invalidateWindow posting = %s", dstRect.toString().c_str());
    24112411#endif
    24122412
    … …  
    24432443    ASSERT(dstBuffer);
    24442444    if (!dstBuffer)
    2445         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelWarn, "Empty window buffer, couldn't clearWindow");
     2445        BBLOG(BlackBerry::Platform::LogLevelWarn, "Empty window buffer, couldn't clearWindow");
    24462446
    24472447    windowFrontBufferState()->clearBlittedRegion(rect);

  • trunk/Source/WebKit/blackberry/Api/WebPage.cpp

    r131326 r131335  
    10641064
    10651065#if DEBUG_WEBPAGE_LOAD
    1066     Platform::log(Platform::LogLevelInfo, "WebPagePrivate::setLoadState %d", state);
     1066    BBLOG(Platform::LogLevelInfo, "WebPagePrivate::setLoadState %d", state);
    10671067#endif
    10681068
    … …  
    12361236#if DEBUG_WEBPAGE_LOAD
    12371237    if (loadState() < Finished)
    1238         Platform::log(Platform::LogLevelInfo, "WebPagePrivate::zoomAboutPoint scale %f anchor (%f, %f)", scale, anchor.x(), anchor.y());
     1238        BBLOG(Platform::LogLevelInfo, "WebPagePrivate::zoomAboutPoint scale %f anchor (%f, %f)", scale, anchor.x(), anchor.y());
    12391239#endif
    12401240
    … …  
    15731573
    15741574#if DEBUG_WEBPAGE_LOAD
    1575     Platform::log(Platform::LogLevelInfo, "WebPagePrivate::contentsSizeChanged %dx%d", contentsSize.width(), contentsSize.height());
     1575    BBLOG(Platform::LogLevelInfo, "WebPagePrivate::contentsSizeChanged %dx%d", contentsSize.width(), contentsSize.height());
    15761576#endif
    15771577}
    … …  
    16441644{
    16451645#if DEBUG_WEBPAGE_LOAD
    1646     Platform::log(Platform::LogLevelInfo, "WebPagePrivate::zoomToInitialScaleOnLoad");
     1646    BBLOG(Platform::LogLevelInfo, "WebPagePrivate::zoomToInitialScaleOnLoad");
    16471647#endif
    16481648
    … …  
    16621662    if (contentsSize().isEmpty()) {
    16631663#if DEBUG_WEBPAGE_LOAD
    1664         Platform::log(Platform::LogLevelInfo, "WebPagePrivate::zoomToInitialScaleOnLoad content is empty!");
     1664        BBLOG(Platform::LogLevelInfo, "WebPagePrivate::zoomToInitialScaleOnLoad content is empty!");
    16651665#endif
    16661666        requestLayoutIfNeeded();
    … …  
    54695469    if (!m_rootLayerCommitTimer->isActive()) {
    54705470#if DEBUG_AC_COMMIT
    5471         Platform::log(Platform::LogLevelCritical, "%s: m_rootLayerCommitTimer->isActive() = %d", WTF_PRETTY_FUNCTION, m_rootLayerCommitTimer->isActive());
     5471        BBLOG(Platform::LogLevelCritical, "%s: m_rootLayerCommitTimer->isActive() = %d", WTF_PRETTY_FUNCTION, m_rootLayerCommitTimer->isActive());
    54725472#endif
    54735473        m_rootLayerCommitTimer->startOneShot(0);
    … …  
    55575557{
    55585558#if DEBUG_AC_COMMIT
    5559     Platform::log(Platform::LogLevelCritical, "%s: m_compositor = 0x%x",
     5559    BBLOG(Platform::LogLevelCritical, "%s: m_compositor = 0x%x",
    55605560            WTF_PRETTY_FUNCTION, m_compositor.get());
    55615561#endif
    … …  
    55965596{
    55975597#if DEBUG_AC_COMMIT
    5598     Platform::log(Platform::LogLevelCritical, "%s: m_suspendRootLayerCommit = %d, m_needsCommit = %d, m_frameLayers = 0x%x, m_frameLayers->hasLayer() = %d, needsLayoutRecursive() = %d",
     5598    BBLOG(Platform::LogLevelCritical, "%s: m_suspendRootLayerCommit = %d, m_needsCommit = %d, m_frameLayers = 0x%x, m_frameLayers->hasLayer() = %d, needsLayoutRecursive() = %d",
    55995599            WTF_PRETTY_FUNCTION,
    56005600            m_suspendRootLayerCommit,
    … …  
    56745674
    56755675#if DEBUG_AC_COMMIT
    5676     Platform::log(Platform::LogLevelCritical, "%s", WTF_PRETTY_FUNCTION);
     5676    BBLOG(Platform::LogLevelCritical, "%s", WTF_PRETTY_FUNCTION);
    56775677#endif
    56785678
    … …  
    57015701        if (needsOneShotDrawingSynchronization()) {
    57025702#if DEBUG_AC_COMMIT
    5703             Platform::log(Platform::LogLevelCritical, "%s: OneShotDrawingSynchronization code path!", WTF_PRETTY_FUNCTION);
     5703            BBLOG(Platform::LogLevelCritical, "%s: OneShotDrawingSynchronization code path!", WTF_PRETTY_FUNCTION);
    57045704#endif
    57055705

  • trunk/Source/WebKit/blackberry/ChangeLog

    r131326 r131335  
     12012-10-15  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
     2
     3        [BlackBerry] replace BlackBerry::Platform::log() with BBLOG()
     4        https://bugs.webkit.org/show_bug.cgi?id=99302
     5
     6        Reviewed by Rob Buis.
     7
     8        RIM PR: 210884
     9        The marco BBLOG() is defined as a no-op in release mode which will
     10        save a function call in the release build.
     11        Internally reviewed by Charles Wei.
     12
     13        * Api/BackingStore.cpp:
     14        (BlackBerry::WebKit::bestDivisor):
     15        (BlackBerry::WebKit::BackingStorePrivate::suspendScreenAndBackingStoreUpdates):
     16        (BlackBerry::WebKit::BackingStorePrivate::resumeScreenAndBackingStoreUpdates):
     17        (BlackBerry::WebKit::BackingStorePrivate::repaint):
     18        (BlackBerry::WebKit::BackingStorePrivate::slowScroll):
     19        (BlackBerry::WebKit::BackingStorePrivate::scroll):
     20        (BlackBerry::WebKit::BackingStorePrivate::setBackingStoreRect):
     21        (BlackBerry::WebKit::BackingStorePrivate::scrollBackingStore):
     22        (BlackBerry::WebKit::BackingStorePrivate::render):
     23        (BlackBerry::WebKit::BackingStorePrivate::blitVisibleContents):
     24        (BlackBerry::WebKit::BackingStorePrivate::updateTilesForScrollOrNotRenderedRegion):
     25        (BlackBerry::WebKit::BackingStorePrivate::renderContents):
     26        (BlackBerry::WebKit::BackingStorePrivate::blitToWindow):
     27        (BlackBerry::WebKit::BackingStorePrivate::fillWindow):
     28        (BlackBerry::WebKit::BackingStorePrivate::invalidateWindow):
     29        (BlackBerry::WebKit::BackingStorePrivate::clearWindow):
     30        * Api/WebPage.cpp:
     31        (BlackBerry::WebKit::WebPagePrivate::setLoadState):
     32        (BlackBerry::WebKit::WebPagePrivate::zoomAboutPoint):
     33        (BlackBerry::WebKit::WebPagePrivate::contentsSizeChanged):
     34        (BlackBerry::WebKit::WebPagePrivate::zoomToInitialScaleOnLoad):
     35        (BlackBerry::WebKit::WebPagePrivate::scheduleRootLayerCommit):
     36        (BlackBerry::WebKit::WebPagePrivate::commitRootLayer):
     37        (BlackBerry::WebKit::WebPagePrivate::commitRootLayerIfNeeded):
     38        (BlackBerry::WebKit::WebPagePrivate::rootLayerCommitTimerFired):
     39        * WebCoreSupport/ChromeClientBlackBerry.cpp:
     40        (WebCore::ChromeClientBlackBerry::overflowExceedsContentsSize):
     41        (WebCore::ChromeClientBlackBerry::didDiscoverFrameSet):
     42        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
     43        (WebCore::FrameLoaderClientBlackBerry::dispatchDidLayout):
     44        * WebKitSupport/FatFingers.cpp:
     45        (BlackBerry::WebKit::FatFingers::checkFingerIntersection):
     46        (BlackBerry::WebKit::FatFingers::findIntersectingRegions):
     47        (BlackBerry::WebKit::FatFingers::checkForText):
     48        * WebKitSupport/RenderQueue.cpp:
     49        (BlackBerry::WebKit::RenderQueue::addToRegularQueue):
     50        (BlackBerry::WebKit::RenderQueue::addToScrollZoomQueue):
     51        (BlackBerry::WebKit::RenderQueue::render):
     52        (BlackBerry::WebKit::RenderQueue::renderAllCurrentRegularRenderJobs):
     53        (BlackBerry::WebKit::RenderQueue::startRegularRenderJobBatchIfNeeded):
     54        (BlackBerry::WebKit::RenderQueue::renderVisibleZoomJob):
     55        (BlackBerry::WebKit::RenderQueue::renderVisibleScrollJob):
     56        (BlackBerry::WebKit::RenderQueue::renderRegularRenderJob):
     57        (BlackBerry::WebKit::RenderQueue::renderNonVisibleScrollJob):
     58        * WebKitSupport/SurfacePool.cpp:
     59        (BlackBerry::WebKit::SurfacePool::initialize):
     60
    1612012-10-15  Xiaobo Wang  <xbwang@torchmobile.com.cn>
    262

  • trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp

    r131316 r131335  
    680680
    681681#if DEBUG_OVERFLOW_DETECTION
    682     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "ChromeClientBlackBerry::overflowExceedsContentsSize contents=%dx%d overflow=%dx%d",
     682    BBLOG(BlackBerry::Platform::LogLevelInfo, "ChromeClientBlackBerry::overflowExceedsContentsSize contents=%dx%d overflow=%dx%d",
    683683                           frame->contentRenderer()->rightLayoutOverflow(),
    684684                           frame->contentRenderer()->bottomLayoutOverflow(),
    … …  
    694694        return;
    695695
    696     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "ChromeClientBlackBerry::didDiscoverFrameSet");
     696    BBLOG(BlackBerry::Platform::LogLevelInfo, "ChromeClientBlackBerry::didDiscoverFrameSet");
    697697    if (m_webPagePrivate->loadState() == WebPagePrivate::Committed) {
    698698        m_webPagePrivate->setShouldUseFixedDesktopMode(true);

  • trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

    r131316 r131335  
    852852
    853853    if (milestones & DidFirstVisuallyNonEmptyLayout) {
    854         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelInfo, "dispatchDidFirstVisuallyNonEmptyLayout");
     854        BBLOG(BlackBerry::Platform::LogLevelInfo, "dispatchDidFirstVisuallyNonEmptyLayout");
    855855
    856856        readyToRender(true);

  • trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp

    r130804 r131335  
    279279    else
    280280        nodeName = "unknown node";
    281     log(LogLevelInfo, "%s has region %s, intersecting at %s (area %d)", nodeName.latin1().data(),
     281    BBLOG(LogLevelInfo, "%s has region %s, intersecting at %s (area %d)", nodeName.latin1().data(),
    282282        regionCopy.toString().c_str(), intersection.toString().c_str(), intersection.area());
    283283#endif
    … …  
    304304    IntRect fingerRect(fingerRectForPoint(frameContentPos));
    305305    IntRect screenFingerRect = m_webPage->mapToTransformed(fingerRect);
    306     log(LogLevelInfo, "fat finger rect now %d, %d, %d, %d", screenFingerRect.x(), screenFingerRect.y(), screenFingerRect.width(), screenFingerRect.height());
     306    BBLOG(LogLevelInfo, "fat finger rect now %d, %d, %d, %d", screenFingerRect.x(), screenFingerRect.y(), screenFingerRect.width(), screenFingerRect.height());
    307307
    308308    // only record the first finger rect
    … …  
    434434            if (!range->text().stripWhiteSpace().isEmpty()) {
    435435#if DEBUG_FAT_FINGERS
    436                 log(LogLevelInfo, "Checking word '%s'", range->text().latin1().data());
     436                BBLOG(LogLevelInfo, "Checking word '%s'", range->text().latin1().data());
    437437#endif
    438438                IntRectRegion rangeRegion(DOMSupport::transformedBoundingBoxForRange(*range));

  • trunk/Source/WebKit/blackberry/WebKitSupport/RenderQueue.cpp

    r129112 r131335  
    363363#if DEBUG_RENDER_QUEUE
    364364    if (m_regularRenderJobsRegion.isRectInRegion(rect) != Platform::IntRectRegion::ContainedInRegion) {
    365         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::addToRegularQueue %d,%d %dx%d",
     365        BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::addToRegularQueue %d,%d %dx%d",
    366366                               rect.x(), rect.y(), rect.width(), rect.height());
    367367    }
    … …  
    384384
    385385#if DEBUG_RENDER_QUEUE
    386     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::addToScrollZoomQueue %d,%d %dx%d",
     386    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::addToScrollZoomQueue %d,%d %dx%d",
    387387                           rect.x(), rect.y(), rect.width(), rect.height());
    388388#endif
    … …  
    570570    double elapsed = WTF::currentTime() - time;
    571571    if (elapsed)
    572         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::render layout elapsed=%f", elapsed);
     572        BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::render layout elapsed=%f", elapsed);
    573573#endif
    574574
    … …  
    600600    double elapsed = WTF::currentTime() - time;
    601601    if (elapsed)
    602         BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs layout elapsed=%f", elapsed);
     602        BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs layout elapsed=%f", elapsed);
    603603#endif
    604604
    … …  
    627627#if DEBUG_RENDER_QUEUE
    628628        if (!regionNotRendered.isEmpty())
    629             BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs region not completely rendered!");
     629            BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs region not completely rendered!");
    630630#endif
    631631
    … …  
    646646    Platform::IntRect extents = m_currentRegularRenderJobsBatchRegion.extents();
    647647    int numberOfRects = m_currentRegularRenderJobsBatchRegion.rects().size();
    648     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs extents=(%d,%d %dx%d) numberOfRects=%d elapsed=%f",
     648    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderAllCurrentRegularRenderJobs extents=(%d,%d %dx%d) numberOfRects=%d elapsed=%f",
    649649                           extents.x(), extents.y(), extents.width(), extents.height(), numberOfRects, elapsed);
    650650#endif
    … …  
    682682
    683683#if DEBUG_RENDER_QUEUE
    684     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::startRegularRenderJobBatchIfNeeded batch size is %d!", m_currentRegularRenderJobsBatch.size());
     684    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::startRegularRenderJobBatchIfNeeded batch size is %d!", m_currentRegularRenderJobsBatch.size());
    685685#endif
    686686}
    … …  
    709709    // Stop the time measurement
    710710    double elapsed = WTF::currentTime() - time;
    711     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleZoomJob rect=(%d,%d %dx%d) elapsed=%f",
     711    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleZoomJob rect=(%d,%d %dx%d) elapsed=%f",
    712712                           subRect.x(), subRect.y(), subRect.width(), subRect.height(), elapsed);
    713713#endif
    … …  
    728728    // Stop the time measurement
    729729    double elapsed = WTF::currentTime() - time;
    730     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleScrollJob sort elapsed=%f", elapsed);
     730    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleScrollJob sort elapsed=%f", elapsed);
    731731#endif
    732732
    … …  
    749749    // Stop the time measurement
    750750    double elapsed = WTF::currentTime() - time;
    751     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleScrollJob rect=(%d,%d %dx%d) elapsed=%f",
     751    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderVisibleScrollJob rect=(%d,%d %dx%d) elapsed=%f",
    752752                           subRect.x(), subRect.y(), subRect.width(), subRect.height(), elapsed);
    753753#endif
    … …  
    781781#if DEBUG_RENDER_QUEUE
    782782        if (!regionNotRendered.isEmpty()) {
    783             BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderRegularRenderJob rect (%d,%d %dx%d) not completely rendered!",
     783            BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderRegularRenderJob rect (%d,%d %dx%d) not completely rendered!",
    784784                                  rect.x(), rect.y(), rect.width(), rect.height());
    785785        }
    … …  
    796796    // Stop the time measurement.
    797797    double elapsed = WTF::currentTime() - time;
    798     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderRegularRenderJob rect=(%d,%d %dx%d) elapsed=%f",
     798    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderRegularRenderJob rect=(%d,%d %dx%d) elapsed=%f",
    799799                           rect.x(), rect.y(), rect.width(), rect.height(), elapsed);
    800800#endif
    … …  
    830830    // Stop the time measurement.
    831831    double elapsed = WTF::currentTime() - time;
    832     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderNonVisibleScrollJob sort elapsed=%f", elapsed);
     832    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderNonVisibleScrollJob sort elapsed=%f", elapsed);
    833833#endif
    834834
    … …  
    855855    // Stop the time measurement.
    856856    double elapsed = WTF::currentTime() - time;
    857     BlackBerry::Platform::log(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderNonVisibleScrollJob rect=(%d,%d %dx%d) elapsed=%f",
     857    BBLOG(BlackBerry::Platform::LogLevelCritical, "RenderQueue::renderNonVisibleScrollJob rect=(%d,%d %dx%d) elapsed=%f",
    858858                           subRect.x(), subRect.y(), subRect.width(), subRect.height(), elapsed);
    859859#endif

  • trunk/Source/WebKit/blackberry/WebKitSupport/SurfacePool.cpp

    r131316 r131335  
    7878        bool success = Platform::Graphics::createPixmapGroup(SHARED_PIXMAP_GROUP, byteLimit);
    7979        if (!success) {
    80             Platform::log(Platform::LogLevelWarn,
     80            BBLOG(Platform::LogLevelWarn,
    8181                "Shared buffer pool could not be set up, using regular memory allocation instead.");
    8282        }
Note: See TracChangeset for help on using the changeset viewer.