Changeset 149824 in webkit


Ignore:
Timestamp:
May 9, 2013 11:13:53 AM (11 years ago)
Author:
mifenton@rim.com
Message:

[BlackBerry] Style updates required based on new check-webkit-style
​https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update WebCore/platform/graphics BlackBerry sources
to match check-webkit-style updates.

Internally reviewed by Jakob Petsovits.

  • platform/graphics/blackberry/CanvasLayerWebKitThread.cpp:
  • platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:

(WebCore::GraphicsContext3D::readPixelsIMG):
(WebCore::GraphicsContext3D::paintToCanvas):

  • platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp:

(WebCore::GraphicsLayerBlackBerry::updateLayerPosition):

  • platform/graphics/blackberry/IntRectBlackBerry.cpp:

(WebCore::IntRect::IntRect):

  • platform/graphics/blackberry/LayerCompositingThread.h:

(WTF::::deref):

  • platform/graphics/blackberry/LayerFilterRenderer.cpp:

(WebCore::LayerFilterRenderer::initializeSharedGLObjects):
(WebCore::LayerFilterRenderer::actionsForOperations):
(WebCore::LayerFilterRenderer::applyActions):

  • platform/graphics/blackberry/LayerRenderer.cpp:

(WebCore::LayerRenderer::setViewport):
(WebCore::LayerRenderer::compositeBuffer):
(WebCore::LayerRenderer::drawColor):
(WebCore::LayerRenderer::compositeLayersRecursive):

  • platform/graphics/blackberry/LayerWebKitThread.cpp:

(WebCore::LayerWebKitThread::setFrame):

  • platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:

(WebCore::MediaPlayerPrivate::play):
(WebCore::MediaPlayerPrivate::waitMetadataTimerFired):

  • platform/image-decoders/blackberry/JPEGImageDecoder.cpp:

(WebCore::JPEGImageDecoder::JPEGImageDecoder):

Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r149823 r149824  
     12013-05-09  Mike Fenton  <mifenton@rim.com>
     2
     3        [BlackBerry] Style updates required based on new check-webkit-style
     4        https://bugs.webkit.org/show_bug.cgi?id=115857
     5
     6        Reviewed by Rob Buis.
     7
     8        Update WebCore/platform/graphics BlackBerry sources
     9        to match check-webkit-style updates.
     10
     11        Internally reviewed by Jakob Petsovits.
     12
     13        * platform/graphics/blackberry/CanvasLayerWebKitThread.cpp:
     14        * platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:
     15        (WebCore::GraphicsContext3D::readPixelsIMG):
     16        (WebCore::GraphicsContext3D::paintToCanvas):
     17        * platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp:
     18        (WebCore::GraphicsLayerBlackBerry::updateLayerPosition):
     19        * platform/graphics/blackberry/IntRectBlackBerry.cpp:
     20        (WebCore::IntRect::IntRect):
     21        * platform/graphics/blackberry/LayerCompositingThread.h:
     22        (WTF::::deref):
     23        * platform/graphics/blackberry/LayerFilterRenderer.cpp:
     24        (WebCore::LayerFilterRenderer::initializeSharedGLObjects):
     25        (WebCore::LayerFilterRenderer::actionsForOperations):
     26        (WebCore::LayerFilterRenderer::applyActions):
     27        * platform/graphics/blackberry/LayerRenderer.cpp:
     28        (WebCore::LayerRenderer::setViewport):
     29        (WebCore::LayerRenderer::compositeBuffer):
     30        (WebCore::LayerRenderer::drawColor):
     31        (WebCore::LayerRenderer::compositeLayersRecursive):
     32        * platform/graphics/blackberry/LayerWebKitThread.cpp:
     33        (WebCore::LayerWebKitThread::setFrame):
     34        * platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
     35        (WebCore::MediaPlayerPrivate::play):
     36        (WebCore::MediaPlayerPrivate::waitMetadataTimerFired):
     37        * platform/image-decoders/blackberry/JPEGImageDecoder.cpp:
     38        (WebCore::JPEGImageDecoder::JPEGImageDecoder):
     39
    1402013-05-09  Mike Fenton  <mifenton@rim.com>
    241

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

    r148881 r149824  
    1919#include "config.h"
    2020#include "CanvasLayerWebKitThread.h"
     21
    2122#include "LayerCompositingThread.h"
    2223

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

    r148881 r149824  
    280280
    281281    // Calculate the strides of our data and canvas
    282     unsigned int formatSize = 4; // RGBA UNSIGNED_BYTE
    283     unsigned int dataStride = width * formatSize;
    284     unsigned int canvasStride = m_currentWidth * formatSize;
     282    unsigned formatSize = 4; // RGBA UNSIGNED_BYTE
     283    unsigned dataStride = width * formatSize;
     284    unsigned canvasStride = m_currentWidth * formatSize;
    285285
    286286    // If we are using a pack alignment of 8, then we need to align our strides to 8 byte boundaries
    … …  
    312312    IntRect nonZeroDataRect = intersection(dataRect, canvasRect);
    313313
    314     unsigned int xDataOffset = x < 0 ? -x * formatSize : 0;
    315     unsigned int yDataOffset = y < 0 ? -y * dataStride : 0;
    316     unsigned int xCanvasOffset = nonZeroDataRect.x() * formatSize;
    317     unsigned int yCanvasOffset = nonZeroDataRect.y() * canvasStride;
     314    unsigned xDataOffset = x < 0 ? -x * formatSize : 0;
     315    unsigned yDataOffset = y < 0 ? -y * dataStride : 0;
     316    unsigned xCanvasOffset = nonZeroDataRect.x() * formatSize;
     317    unsigned yCanvasOffset = nonZeroDataRect.y() * canvasStride;
    318318    unsigned char* dst = static_cast<unsigned char*>(data) + xDataOffset + yDataOffset;
    319319    unsigned char* src = canvasData + xCanvasOffset + yCanvasOffset;
    … …  
    361361
    362362void GraphicsContext3D::paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight, int canvasWidth, int canvasHeight,
    363        GraphicsContext* context)
     363    GraphicsContext* context)
    364364{
    365365    FloatRect src(0, 0, canvasWidth, canvasHeight);

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

    r146499 r149824  
    662662{
    663663    // Position is offset on the layer by the layer anchor point.
    664     FloatPoint layerPosition(m_position.x() + m_anchorPoint.x() * m_size.width(),
    665                              m_position.y() + m_anchorPoint.y() * m_size.height());
     664    FloatPoint layerPosition(
     665        m_position.x() + m_anchorPoint.x() * m_size.width(),
     666        m_position.y() + m_anchorPoint.y() * m_size.height());
    666667
    667668    primaryLayer()->setPosition(layerPosition);

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

    r108245 r149824  
    2525
    2626IntRect::IntRect(const BlackBerry::Platform::IntRect& rect)
    27         : m_location(rect.x(), rect.y()), m_size(rect.width(), rect.height())
     27    : m_location(rect.x(), rect.y()), m_size(rect.width(), rect.height())
    2828{
    2929}

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

    r148129 r149824  
    291291        // Delete on the compositing thread.
    292292        BlackBerry::Platform::GuardedPointerDeleter::deleteOnThread(
    293                 BlackBerry::Platform::userInterfaceThreadMessageClient(),
    294                 static_cast<WebCore::LayerCompositingThread*>(this));
     293            BlackBerry::Platform::userInterfaceThreadMessageClient(),
     294            static_cast<WebCore::LayerCompositingThread*>(this));
    295295    }
    296296}

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

    r148423 r149824  
    354354        "uniform lowp sampler2D s_texture;\n"\
    355355        "uniform highp float u_amount;\n"\
    356         #x\
     356#x\
    357357        "void main(void)\n { gl_FragColor = shade(texture2D(s_texture, v_texCoord)); }"
    358358
    … …  
    365365        "uniform highp float u_blurSize;\n"\
    366366        "const float pi = 3.1415927;\n"\
    367         #x\
     367#x\
    368368        "void main(void)\n"\
    369369        "{\n"\
    … …  
    397397            lowp float amount = 1.0 - u_amount;
    398398            return vec4((0.2126 + 0.7874 * amount) * color.r + (0.7152 - 0.7152 * amount) * color.g + (0.0722 - 0.0722 * amount) * color.b,
    399                         (0.2126 - 0.2126 * amount) * color.r + (0.7152 + 0.2848 * amount) * color.g + (0.0722 - 0.0722 * amount) * color.b,
    400                         (0.2126 - 0.2126 * amount) * color.r + (0.7152 - 0.7152 * amount) * color.g + (0.0722 + 0.9278 * amount) * color.b,
    401                         color.a);
     399                (0.2126 - 0.2126 * amount) * color.r + (0.7152 + 0.2848 * amount) * color.g + (0.0722 - 0.0722 * amount) * color.b,
     400                (0.2126 - 0.2126 * amount) * color.r + (0.7152 - 0.7152 * amount) * color.g + (0.0722 + 0.9278 * amount) * color.b,
     401                color.a);
    402402        }
    403403    );
    … …  
    408408            lowp float amount = 1.0 - u_amount;
    409409            return vec4((0.393 + 0.607 * amount) * color.r + (0.769 - 0.769 * amount) * color.g + (0.189 - 0.189 * amount) * color.b,
    410                         (0.349 - 0.349 * amount) * color.r + (0.686 + 0.314 * amount) * color.g + (0.168 - 0.168 * amount) * color.b,
    411                         (0.272 - 0.272 * amount) * color.r + (0.534 - 0.534 * amount) * color.g + (0.131 + 0.869 * amount) * color.b,
    412                         color.a);
    413          }
     410                (0.349 - 0.349 * amount) * color.r + (0.686 + 0.314 * amount) * color.g + (0.168 - 0.168 * amount) * color.b,
     411                (0.272 - 0.272 * amount) * color.r + (0.534 - 0.534 * amount) * color.g + (0.131 + 0.869 * amount) * color.b,
     412                color.a);
     413        }
    414414    );
    415415
    … …  
    418418        {
    419419            return vec4((0.213 + 0.787 * u_amount) * color.r + (0.715 - 0.715 * u_amount) * color.g + (0.072 - 0.072 * u_amount) * color.b,
    420                         (0.213 - 0.213 * u_amount) * color.r + (0.715 + 0.285 * u_amount) * color.g + (0.072 - 0.072 * u_amount) * color.b,
    421                         (0.213 - 0.213 * u_amount) * color.r + (0.715 - 0.715 * u_amount) * color.g + (0.072 + 0.928 * u_amount) * color.b,
    422                         color.a);
     420                (0.213 - 0.213 * u_amount) * color.r + (0.715 + 0.285 * u_amount) * color.g + (0.072 - 0.072 * u_amount) * color.b,
     421                (0.213 - 0.213 * u_amount) * color.r + (0.715 - 0.715 * u_amount) * color.g + (0.072 + 0.928 * u_amount) * color.b,
     422                color.a);
    423423        }
    424424    );
    … …  
    431431            highp float s = sin(u_amount * pi / 180.0);
    432432            return vec4(color.r * (0.213 + c * 0.787 - s * 0.213) + color.g * (0.715 - c * 0.715 - s * 0.715) + color.b * (0.072 - c * 0.072 + s * 0.928),
    433                         color.r * (0.213 - c * 0.213 + s * 0.143) + color.g * (0.715 + c * 0.285 + s * 0.140) + color.b * (0.072 - c * 0.072 - s * 0.283),
    434                         color.r * (0.213 - c * 0.213 - s * 0.787) +  color.g * (0.715 - c * 0.715 + s * 0.715) + color.b * (0.072 + c * 0.928 + s * 0.072),
    435                         color.a);
     433                color.r * (0.213 - c * 0.213 + s * 0.143) + color.g * (0.715 + c * 0.285 + s * 0.140) + color.b * (0.072 - c * 0.072 - s * 0.283),
     434                color.r * (0.213 - c * 0.213 - s * 0.787) +  color.g * (0.715 - c * 0.715 + s * 0.715) + color.b * (0.072 + c * 0.928 + s * 0.072),
     435                color.a);
    436436        }
    437437    );
    … …  
    593593{
    594594    Vector<RefPtr<LayerFilterRendererAction> > ret;
    595     for (unsigned int i = 0; i < ops.size(); ++i) {
     595    for (unsigned i = 0; i < ops.size(); ++i) {
    596596        const FilterOperation& operation = *ops[i].get();
    597597        if (operation.getOperationType() == FilterOperation::BLUR && static_cast<const BlurFilterOperation&>(operation).stdDeviation().value() < 0.1)
    … …  
    724724    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
    725725
    726     for (unsigned int i = 0; i < actions.size(); ++i) {
     726    for (unsigned i = 0; i < actions.size(); ++i) {
    727727        // NOTE ABOUT PING-PONGING
    728728        // =======================

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

    r148200 r149824  
    3434
    3535#if USE(ACCELERATED_COMPOSITING)
    36 
    3736#include "LayerRenderer.h"
    38 #include "LayerRendererClient.h"
    3937
    4038#include "LayerCompositingThread.h"
    4139#include "LayerFilterRenderer.h"
     40#include "LayerRendererClient.h"
    4241#include "TextureCacheCompositingThread.h"
    4342
    … …  
    243242    m_clipRect.intersect(targetRect);
    244243    m_clipRect = FloatRect(-1 + 2 * (m_clipRect.x() - targetRect.x()) / targetRect.width(),
    245                            -1 + 2 * (m_clipRect.y() - targetRect.y()) / targetRect.height(),
    246                            2 * m_clipRect.width() / targetRect.width(),
    247                            2 * m_clipRect.height() / targetRect.height());
     244        -1 + 2 * (m_clipRect.y() - targetRect.y()) / targetRect.height(),
     245        2 * m_clipRect.width() / targetRect.width(),
     246        2 * m_clipRect.height() / targetRect.height());
    248247
    249248#if DEBUG_CLIPPING
    … …  
    382381
    383382    FloatQuad vertices(transform.mapPoint(contents.minXMinYCorner()),
    384                        transform.mapPoint(contents.minXMaxYCorner()),
    385                        transform.mapPoint(contents.maxXMaxYCorner()),
    386                        transform.mapPoint(contents.maxXMinYCorner()));
     383        transform.mapPoint(contents.minXMaxYCorner()),
     384        transform.mapPoint(contents.maxXMaxYCorner()),
     385        transform.mapPoint(contents.maxXMinYCorner()));
    387386
    388387    if (!vertices.boundingBox().intersects(m_clipRect))
    … …  
    392391        glEnable(GL_BLEND);
    393392        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
    394     } else {
     393    } else
    395394        glDisable(GL_BLEND);
    396     }
    397395
    398396    if (BlackBerry::Platform::Graphics::lockAndBindBufferGLTexture(buffer, GL_TEXTURE_2D)) {
    … …  
    411409{
    412410    FloatQuad vertices(transform.mapPoint(contents.minXMinYCorner()),
    413                        transform.mapPoint(contents.minXMaxYCorner()),
    414                        transform.mapPoint(contents.maxXMaxYCorner()),
    415                        transform.mapPoint(contents.maxXMinYCorner()));
     411        transform.mapPoint(contents.minXMaxYCorner()),
     412        transform.mapPoint(contents.maxXMaxYCorner()),
     413        transform.mapPoint(contents.maxXMinYCorner()));
    416414
    417415    if (!vertices.boundingBox().intersects(m_clipRect))
    … …  
    995993            continue;
    996994
    997          compositeLayersRecursive(sublayer, newStencilValue, clipRect);
     995        compositeLayersRecursive(sublayer, newStencilValue, clipRect);
    998996    }
    999997

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

    r148199 r149824  
    394394{
    395395    if (rect == m_frame)
    396       return;
     396        return;
    397397
    398398    m_frame = rect;

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

    r149769 r149824  
    220220void MediaPlayerPrivate::play()
    221221{
    222     if (m_platformPlayer) {
     222    if (m_platformPlayer)
    223223        m_platformPlayer->play();
    224     }
    225224}
    226225
    … …  
    714713        onPauseNotified();
    715714    else {
    716         if (m_platformPlayer->isMetadataReady()) {
     715        if (m_platformPlayer->isMetadataReady())
    717716            m_platformPlayer->playWithMetadataReady();
    718         } else
     717        else
    719718            m_waitMetadataTimer.startOneShot(checkMetadataReadyInterval);
    720719    }

  • trunk/Source/WebCore/platform/image-decoders/blackberry/JPEGImageDecoder.cpp

    r101336 r149824  
    163163
    164164JPEGImageDecoder::JPEGImageDecoder(ImageSource::AlphaOption alphaOption,
    165                                    ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption)
     165    ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption)
    166166    : ImageDecoder(alphaOption, gammaAndColorProfileOption)
    167167{
Note: See TracChangeset for help on using the changeset viewer.