ChangeLog

2012-09-26  Arvid Nilsson  <anilsson@rim.com>

        [BlackBerry] Destroy thread-specific data for Platform::Graphics::Buffer on the right thread

        https://bugs.webkit.org/show_bug.cgi?id=97674

        Reviewed by NOBODY (OOPS!).

        A new API was added to BlackBerry::Platform::Graphics for destroying

        thread-specific data generated on the compositing thread when we blit

        buffers. The buffers are otherwise created and destroyed on the WebKit

        thread, which doesn't give platform any opportunity to destroy the

        thread-specific data.

        This patch adds calls to the new API to avoid leaking resources.

        Reviewed internally by Jakob Petsovits and Filip Spacek.

        PR 214644

        * WebKitSupport/SurfacePool.cpp:

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

        (BlackBerry::WebKit::SurfacePool::createPlatformGraphicsContext):

        (BlackBerry::WebKit::SurfacePool::lockTileRenderingSurface):

        (BlackBerry::WebKit::SurfacePool::releaseTileRenderingSurface):

        (BlackBerry::WebKit::SurfacePool::initializeVisibleTileBuffer):

        (BlackBerry::WebKit::SurfacePool::createBuffers):

        (BlackBerry::WebKit::SurfacePool::releaseBuffers):

2012-09-26  Jakob Petsovits  <jpetsovits@rim.com>

        [BlackBerry] Remove blitContents() in favor of blitVisibleContents().

Source/WebCore/plugins/blackberry/PluginViewPrivateBlackBerry.cpp

#include "PluginLayerWebKitThread.h"

#endif

#include "NPCallbacksBlackBerry.h"

28#include <BlackBerryPlatformExecutableMessage.h>

29#include <BlackBerryPlatformMessageClient.h>

#include <wtf/MainThread.h>

static unsigned s_counter = 0;

@@bool PluginViewPrivate::createBuffers(NPSurfaceFormat format, int width, int hei

    PthreadMutexLocker backLock(&m_backBufferMutex);

    PthreadWriteLocker frontLock(&m_frontBufferRwLock);

282 bool didDestroyBuffers = false;

280283 for (int i = 0; i < PLUGIN_BUFFERS; i++) {

281284 if (m_pluginBuffers[i]) {

285 didDestroyBuffers = true;

            BlackBerry::Platform::Graphics::destroyBuffer(m_pluginBuffers[i]);

            m_pluginBuffers[i] = 0;

        }

@@bool PluginViewPrivate::createBuffers(NPSurfaceFormat format, int width, int hei

    if (success) {

        m_pluginBufferSize = IntSize(width, height);

        m_pluginBufferType = toBufferType(format);

        if (didDestroyBuffers) {

            BlackBerry::Platform::userInterfaceThreadMessageClient()->dispatchSyncMessage(

                BlackBerry::Platform::createFunctionCallMessage(&BlackBerry::Platform::Graphics::collectThreadSpecificGarbage));

        }

    } else {

        m_pluginBufferSize = IntSize();

        m_pluginBufferType = BlackBerry::Platform::Graphics::PluginBufferWithAlpha;

@@bool PluginViewPrivate::destroyBuffers()

    PthreadMutexLocker backLock(&m_backBufferMutex);

    PthreadWriteLocker frontLock(&m_frontBufferRwLock);

370 bool didDestroyBuffers = false;

361371 for (int i = 0; i < PLUGIN_BUFFERS; i++) {

362372 if (m_pluginBuffers[i]) {

373 didDestroyBuffers = true;

            BlackBerry::Platform::Graphics::destroyBuffer(m_pluginBuffers[i]);

            m_pluginBuffers[i] = 0;

        }

    }

    m_pluginBufferSize = IntSize();

    if (didDestroyBuffers) {

        BlackBerry::Platform::userInterfaceThreadMessageClient()->dispatchSyncMessage(

            BlackBerry::Platform::createFunctionCallMessage(&BlackBerry::Platform::Graphics::collectThreadSpecificGarbage));

    }

    return true;

}

Source/WebKit/blackberry/WebKitSupport/SurfacePool.cpp

#include "PlatformContextSkia.h"

24#include <BlackBerryPlatformExecutableMessage.h>

2425#include <BlackBerryPlatformGraphics.h>

2526#include <BlackBerryPlatformLog.h>

27#include <BlackBerryPlatformMessageClient.h>

#include <BlackBerryPlatformMisc.h>

#include <BlackBerryPlatformScreen.h>

#include <BlackBerryPlatformSettings.h>

@@SurfacePool::SurfacePool()

{

}

65 void SurfacePool::initialize(const ~~BlackBerry::~~Platform::IntSize& tileSize)

67void SurfacePool::initialize(const Platform::IntSize& tileSize)

{

    if (m_initialized)

        return;

    m_initialized = true;

71 const unsigned numberOfTiles = ~~BlackBerry::~~Platform::Settings::instance()->numberOfBackingStoreTiles();

72 const unsigned maxNumberOfTiles = ~~BlackBerry::~~Platform::Settings::instance()->maximumNumberOfBackingStoreTilesAcrossProcesses();

73 const unsigned numberOfTiles = Platform::Settings::instance()->numberOfBackingStoreTiles();

74 const unsigned maxNumberOfTiles = Platform::Settings::instance()->maximumNumberOfBackingStoreTilesAcrossProcesses();

    if (numberOfTiles) { // Only allocate if we actually use a backingstore.

        unsigned byteLimit = (maxNumberOfTiles /*pool*/ + 2 /*visible tile buffer, backbuffer*/) * tileSize.width() * tileSize.height() * 4;

76 bool success = ~~BlackBerry::~~Platform::Graphics::createPixmapGroup(SHARED_PIXMAP_GROUP, byteLimit);

78 bool success = Platform::Graphics::createPixmapGroup(SHARED_PIXMAP_GROUP, byteLimit);

7779 if (!success) {

78 ~~BlackBerry::~~Platform::log(~~BlackBerry::~~Platform::LogLevelWarn,

80 Platform::log(Platform::LogLevelWarn,

                "Shared buffer pool could not be set up, using regular memory allocation instead.");

        }

    }

83 m_tileRenderingSurface = ~~BlackBerry::~~Platform::Graphics::drawingSurface();

85 m_tileRenderingSurface = Platform::Graphics::drawingSurface();

    if (!numberOfTiles)

        return; // we only use direct rendering when 0 tiles are specified.

@@void SurfacePool::initialize(const BlackBerry::Platform::IntSize& tileSize)

    pthread_mutexattr_destroy(&attr);

}

116 PlatformGraphicsContext* SurfacePool::createPlatformGraphicsContext(~~BlackBerry::~~Platform::Graphics::Drawable* drawable) const

118PlatformGraphicsContext* SurfacePool::createPlatformGraphicsContext(Platform::Graphics::Drawable* drawable) const

{

    return new WebCore::PlatformContextSkia(drawable);

}

@@PlatformGraphicsContext* SurfacePool::lockTileRenderingSurface() const

    if (!m_tileRenderingSurface)

        return 0;

126 return createPlatformGraphicsContext(~~BlackBerry::~~Platform::Graphics::lockBufferDrawable(m_tileRenderingSurface));

128 return createPlatformGraphicsContext(Platform::Graphics::lockBufferDrawable(m_tileRenderingSurface));

}

void SurfacePool::releaseTileRenderingSurface(PlatformGraphicsContext* context) const

@@void SurfacePool::releaseTileRenderingSurface(PlatformGraphicsContext* context)

        return;

    delete context;

135 ~~BlackBerry::~~Platform::Graphics::releaseBufferDrawable(m_tileRenderingSurface);

137 Platform::Graphics::releaseBufferDrawable(m_tileRenderingSurface);

136138}

137139

138 void SurfacePool::initializeVisibleTileBuffer(const ~~BlackBerry::~~Platform::IntSize& visibleSize)

140void SurfacePool::initializeVisibleTileBuffer(const Platform::IntSize& visibleSize)

{

    if (!m_visibleTileBuffer || m_visibleTileBuffer->size() != visibleSize) {

        delete m_visibleTileBuffer;

@@void SurfacePool::createBuffers()

    // Create the tile pool.

    for (size_t i = 0; i < m_tilePool.size(); ++i)

164 ~~BlackBerry::~~Platform::Graphics::createPixmapBuffer(m_tilePool[i]->frontBuffer()->nativeBuffer());

166 Platform::Graphics::createPixmapBuffer(m_tilePool[i]->frontBuffer()->nativeBuffer());

165167

166168 if (m_visibleTileBuffer)

167 ~~BlackBerry::~~Platform::Graphics::createPixmapBuffer(m_visibleTileBuffer->frontBuffer()->nativeBuffer());

169 Platform::Graphics::createPixmapBuffer(m_visibleTileBuffer->frontBuffer()->nativeBuffer());

168170

169171 if (backBuffer())

170 ~~BlackBerry::~~Platform::Graphics::createPixmapBuffer(backBuffer()->nativeBuffer());

172 Platform::Graphics::createPixmapBuffer(backBuffer()->nativeBuffer());

    m_buffersSuspended = false;

}

@@void SurfacePool::releaseBuffers()

    for (size_t i = 0; i < m_tilePool.size(); ++i) {

        m_tilePool[i]->frontBuffer()->clearRenderedRegion();

        // Clear the buffer to prevent accidental leakage of (possibly sensitive) pixel data.

186 ~~BlackBerry::~~Platform::Graphics::clearBuffer(m_tilePool[i]->frontBuffer()->nativeBuffer(), 0, 0, 0, 0);

187 ~~BlackBerry::~~Platform::Graphics::destroyPixmapBuffer(m_tilePool[i]->frontBuffer()->nativeBuffer());

188 Platform::Graphics::clearBuffer(m_tilePool[i]->frontBuffer()->nativeBuffer(), 0, 0, 0, 0);

189 Platform::Graphics::destroyPixmapBuffer(m_tilePool[i]->frontBuffer()->nativeBuffer());

    }

    if (m_visibleTileBuffer) {

        m_visibleTileBuffer->frontBuffer()->clearRenderedRegion();

192 ~~BlackBerry::~~Platform::Graphics::clearBuffer(m_visibleTileBuffer->frontBuffer()->nativeBuffer(), 0, 0, 0, 0);

193 ~~BlackBerry::~~Platform::Graphics::destroyPixmapBuffer(m_visibleTileBuffer->frontBuffer()->nativeBuffer());

194 Platform::Graphics::clearBuffer(m_visibleTileBuffer->frontBuffer()->nativeBuffer(), 0, 0, 0, 0);

195 Platform::Graphics::destroyPixmapBuffer(m_visibleTileBuffer->frontBuffer()->nativeBuffer());

    }

    if (backBuffer()) {

        backBuffer()->clearRenderedRegion();

198 ~~BlackBerry::~~Platform::Graphics::clearBuffer(backBuffer()->nativeBuffer(), 0, 0, 0, 0);

199 ~~BlackBerry::~~Platform::Graphics::destroyPixmapBuffer(backBuffer()->nativeBuffer());

200 Platform::Graphics::clearBuffer(backBuffer()->nativeBuffer(), 0, 0, 0, 0);

201 Platform::Graphics::destroyPixmapBuffer(backBuffer()->nativeBuffer());

200202 }

    Platform::userInterfaceThreadMessageClient()->dispatchSyncMessage(

        Platform::createFunctionCallMessage(&Platform::Graphics::collectThreadSpecificGarbage));

}

void SurfacePool::waitForBuffer(TileBuffer* tileBuffer)

Source/WebCore/ChangeLog

Source/WebKit/blackberry/ChangeLog

Source/WebCore/plugins/blackberry/PluginViewPrivateBlackBerry.cpp

Source/WebKit/blackberry/WebKitSupport/SurfacePool.cpp