<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149824] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/149824">149824</a></dd>
<dt>Author</dt> <dd>mifenton@rim.com</dd>
<dt>Date</dt> <dd>2013-05-09 11:13:53 -0700 (Thu, 09 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsblackberryCanvasLayerWebKitThreadcpp">trunk/Source/WebCore/platform/graphics/blackberry/CanvasLayerWebKitThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsblackberryGraphicsContext3DBlackBerrycpp">trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsblackberryGraphicsLayerBlackBerrycpp">trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsblackberryIntRectBlackBerrycpp">trunk/Source/WebCore/platform/graphics/blackberry/IntRectBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsblackberryLayerCompositingThreadh">trunk/Source/WebCore/platform/graphics/blackberry/LayerCompositingThread.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsblackberryLayerFilterRenderercpp">trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsblackberryLayerRenderercpp">trunk/Source/WebCore/platform/graphics/blackberry/LayerRenderer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsblackberryLayerWebKitThreadcpp">trunk/Source/WebCore/platform/graphics/blackberry/LayerWebKitThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsblackberryMediaPlayerPrivateBlackBerrycpp">trunk/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersblackberryJPEGImageDecodercpp">trunk/Source/WebCore/platform/image-decoders/blackberry/JPEGImageDecoder.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/ChangeLog        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -5,6 +5,45 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Rob Buis.
</span><span class="cx"> 
</span><ins>+        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):
+
+2013-05-09  Mike Fenton  &lt;mifenton@rim.com&gt;
+
+        [BlackBerry] Style updates required based on new check-webkit-style
+        https://bugs.webkit.org/show_bug.cgi?id=115857
+
+        Reviewed by Rob Buis.
+
</ins><span class="cx">         Update WebCore/platform/network/blackberry
</span><span class="cx">         to match check-webkit-style updates.
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsblackberryCanvasLayerWebKitThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/blackberry/CanvasLayerWebKitThread.cpp (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/blackberry/CanvasLayerWebKitThread.cpp        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/graphics/blackberry/CanvasLayerWebKitThread.cpp        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;CanvasLayerWebKitThread.h&quot;
</span><ins>+
</ins><span class="cx"> #include &quot;LayerCompositingThread.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING) &amp;&amp; ENABLE(ACCELERATED_2D_CANVAS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsblackberryGraphicsContext3DBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -279,9 +279,9 @@
</span><span class="cx">     // If this ever changes, this code will need to be updated.
</span><span class="cx"> 
</span><span class="cx">     // Calculate the strides of our data and canvas
</span><del>-    unsigned int formatSize = 4; // RGBA UNSIGNED_BYTE
-    unsigned int dataStride = width * formatSize;
-    unsigned int canvasStride = m_currentWidth * formatSize;
</del><ins>+    unsigned formatSize = 4; // RGBA UNSIGNED_BYTE
+    unsigned dataStride = width * formatSize;
+    unsigned canvasStride = m_currentWidth * formatSize;
</ins><span class="cx"> 
</span><span class="cx">     // If we are using a pack alignment of 8, then we need to align our strides to 8 byte boundaries
</span><span class="cx">     // See: http://en.wikipedia.org/wiki/Data_structure_alignment (computing padding)
</span><span class="lines">@@ -311,10 +311,10 @@
</span><span class="cx">     IntRect canvasRect(0, 0, m_currentWidth, m_currentHeight);
</span><span class="cx">     IntRect nonZeroDataRect = intersection(dataRect, canvasRect);
</span><span class="cx"> 
</span><del>-    unsigned int xDataOffset = x &lt; 0 ? -x * formatSize : 0;
-    unsigned int yDataOffset = y &lt; 0 ? -y * dataStride : 0;
-    unsigned int xCanvasOffset = nonZeroDataRect.x() * formatSize;
-    unsigned int yCanvasOffset = nonZeroDataRect.y() * canvasStride;
</del><ins>+    unsigned xDataOffset = x &lt; 0 ? -x * formatSize : 0;
+    unsigned yDataOffset = y &lt; 0 ? -y * dataStride : 0;
+    unsigned xCanvasOffset = nonZeroDataRect.x() * formatSize;
+    unsigned yCanvasOffset = nonZeroDataRect.y() * canvasStride;
</ins><span class="cx">     unsigned char* dst = static_cast&lt;unsigned char*&gt;(data) + xDataOffset + yDataOffset;
</span><span class="cx">     unsigned char* src = canvasData + xCanvasOffset + yCanvasOffset;
</span><span class="cx">     for (int row = 0; row &lt; nonZeroDataRect.height(); row++) {
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> void GraphicsContext3D::paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight, int canvasWidth, int canvasHeight,
</span><del>-       GraphicsContext* context)
</del><ins>+    GraphicsContext* context)
</ins><span class="cx"> {
</span><span class="cx">     FloatRect src(0, 0, canvasWidth, canvasHeight);
</span><span class="cx">     FloatRect dst(0, 0, imageWidth, imageHeight);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsblackberryGraphicsLayerBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -661,8 +661,9 @@
</span><span class="cx"> void GraphicsLayerBlackBerry::updateLayerPosition()
</span><span class="cx"> {
</span><span class="cx">     // Position is offset on the layer by the layer anchor point.
</span><del>-    FloatPoint layerPosition(m_position.x() + m_anchorPoint.x() * m_size.width(),
-                             m_position.y() + m_anchorPoint.y() * m_size.height());
</del><ins>+    FloatPoint layerPosition(
+        m_position.x() + m_anchorPoint.x() * m_size.width(),
+        m_position.y() + m_anchorPoint.y() * m_size.height());
</ins><span class="cx"> 
</span><span class="cx">     primaryLayer()-&gt;setPosition(layerPosition);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsblackberryIntRectBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/blackberry/IntRectBlackBerry.cpp (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/blackberry/IntRectBlackBerry.cpp        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/graphics/blackberry/IntRectBlackBerry.cpp        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> IntRect::IntRect(const BlackBerry::Platform::IntRect&amp; rect)
</span><del>-        : m_location(rect.x(), rect.y()), m_size(rect.width(), rect.height())
</del><ins>+    : m_location(rect.x(), rect.y()), m_size(rect.width(), rect.height())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsblackberryLayerCompositingThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/blackberry/LayerCompositingThread.h (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/blackberry/LayerCompositingThread.h        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/graphics/blackberry/LayerCompositingThread.h        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -290,8 +290,8 @@
</span><span class="cx">     if (derefBase()) {
</span><span class="cx">         // Delete on the compositing thread.
</span><span class="cx">         BlackBerry::Platform::GuardedPointerDeleter::deleteOnThread(
</span><del>-                BlackBerry::Platform::userInterfaceThreadMessageClient(),
-                static_cast&lt;WebCore::LayerCompositingThread*&gt;(this));
</del><ins>+            BlackBerry::Platform::userInterfaceThreadMessageClient(),
+            static_cast&lt;WebCore::LayerCompositingThread*&gt;(this));
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsblackberryLayerFilterRenderercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/graphics/blackberry/LayerFilterRenderer.cpp        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx">         &quot;varying mediump vec2 v_texCoord;\n&quot;\
</span><span class="cx">         &quot;uniform lowp sampler2D s_texture;\n&quot;\
</span><span class="cx">         &quot;uniform highp float u_amount;\n&quot;\
</span><del>-        #x\
</del><ins>+#x\
</ins><span class="cx">         &quot;void main(void)\n { gl_FragColor = shade(texture2D(s_texture, v_texCoord)); }&quot;
</span><span class="cx"> 
</span><span class="cx"> #define BLUR_FILTER(x...) \
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx">         &quot;uniform highp float u_amount;\n&quot;\
</span><span class="cx">         &quot;uniform highp float u_blurSize;\n&quot;\
</span><span class="cx">         &quot;const float pi = 3.1415927;\n&quot;\
</span><del>-        #x\
</del><ins>+#x\
</ins><span class="cx">         &quot;void main(void)\n&quot;\
</span><span class="cx">         &quot;{\n&quot;\
</span><span class="cx">         &quot;vec3 incr;\n&quot;\
</span><span class="lines">@@ -396,9 +396,9 @@
</span><span class="cx">         {
</span><span class="cx">             lowp float amount = 1.0 - u_amount;
</span><span class="cx">             return vec4((0.2126 + 0.7874 * amount) * color.r + (0.7152 - 0.7152 * amount) * color.g + (0.0722 - 0.0722 * amount) * color.b,
</span><del>-                        (0.2126 - 0.2126 * amount) * color.r + (0.7152 + 0.2848 * amount) * color.g + (0.0722 - 0.0722 * amount) * color.b,
-                        (0.2126 - 0.2126 * amount) * color.r + (0.7152 - 0.7152 * amount) * color.g + (0.0722 + 0.9278 * amount) * color.b,
-                        color.a);
</del><ins>+                (0.2126 - 0.2126 * amount) * color.r + (0.7152 + 0.2848 * amount) * color.g + (0.0722 - 0.0722 * amount) * color.b,
+                (0.2126 - 0.2126 * amount) * color.r + (0.7152 - 0.7152 * amount) * color.g + (0.0722 + 0.9278 * amount) * color.b,
+                color.a);
</ins><span class="cx">         }
</span><span class="cx">     );
</span><span class="cx"> 
</span><span class="lines">@@ -407,19 +407,19 @@
</span><span class="cx">         {
</span><span class="cx">             lowp float amount = 1.0 - u_amount;
</span><span class="cx">             return vec4((0.393 + 0.607 * amount) * color.r + (0.769 - 0.769 * amount) * color.g + (0.189 - 0.189 * amount) * color.b,
</span><del>-                        (0.349 - 0.349 * amount) * color.r + (0.686 + 0.314 * amount) * color.g + (0.168 - 0.168 * amount) * color.b,
-                        (0.272 - 0.272 * amount) * color.r + (0.534 - 0.534 * amount) * color.g + (0.131 + 0.869 * amount) * color.b,
-                        color.a);
-         }
</del><ins>+                (0.349 - 0.349 * amount) * color.r + (0.686 + 0.314 * amount) * color.g + (0.168 - 0.168 * amount) * color.b,
+                (0.272 - 0.272 * amount) * color.r + (0.534 - 0.534 * amount) * color.g + (0.131 + 0.869 * amount) * color.b,
+                color.a);
+        }
</ins><span class="cx">     );
</span><span class="cx"> 
</span><span class="cx">     shaderStrs[LayerData::CSSFilterShaderSaturate] = STANDARD_FILTER(
</span><span class="cx">         lowp vec4 shade(lowp vec4 color)
</span><span class="cx">         {
</span><span class="cx">             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,
</span><del>-                        (0.213 - 0.213 * u_amount) * color.r + (0.715 + 0.285 * u_amount) * color.g + (0.072 - 0.072 * u_amount) * color.b,
-                        (0.213 - 0.213 * u_amount) * color.r + (0.715 - 0.715 * u_amount) * color.g + (0.072 + 0.928 * u_amount) * color.b,
-                        color.a);
</del><ins>+                (0.213 - 0.213 * u_amount) * color.r + (0.715 + 0.285 * u_amount) * color.g + (0.072 - 0.072 * u_amount) * color.b,
+                (0.213 - 0.213 * u_amount) * color.r + (0.715 - 0.715 * u_amount) * color.g + (0.072 + 0.928 * u_amount) * color.b,
+                color.a);
</ins><span class="cx">         }
</span><span class="cx">     );
</span><span class="cx"> 
</span><span class="lines">@@ -430,9 +430,9 @@
</span><span class="cx">             highp float c = cos(u_amount * pi / 180.0);
</span><span class="cx">             highp float s = sin(u_amount * pi / 180.0);
</span><span class="cx">             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),
</span><del>-                        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),
-                        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),
-                        color.a);
</del><ins>+                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),
+                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),
+                color.a);
</ins><span class="cx">         }
</span><span class="cx">     );
</span><span class="cx"> 
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx"> Vector&lt;RefPtr&lt;LayerFilterRendererAction&gt; &gt; LayerFilterRenderer::actionsForOperations(LayerRendererSurface* surface, const Vector&lt;RefPtr&lt;FilterOperation&gt; &gt;&amp; ops)
</span><span class="cx"> {
</span><span class="cx">     Vector&lt;RefPtr&lt;LayerFilterRendererAction&gt; &gt; ret;
</span><del>-    for (unsigned int i = 0; i &lt; ops.size(); ++i) {
</del><ins>+    for (unsigned i = 0; i &lt; ops.size(); ++i) {
</ins><span class="cx">         const FilterOperation&amp; operation = *ops[i].get();
</span><span class="cx">         if (operation.getOperationType() == FilterOperation::BLUR &amp;&amp; static_cast&lt;const BlurFilterOperation&amp;&gt;(operation).stdDeviation().value() &lt; 0.1)
</span><span class="cx">             continue;
</span><span class="lines">@@ -723,7 +723,7 @@
</span><span class="cx"> 
</span><span class="cx">     glBindFramebuffer(GL_FRAMEBUFFER, fbo);
</span><span class="cx"> 
</span><del>-    for (unsigned int i = 0; i &lt; actions.size(); ++i) {
</del><ins>+    for (unsigned i = 0; i &lt; actions.size(); ++i) {
</ins><span class="cx">         // NOTE ABOUT PING-PONGING
</span><span class="cx">         // =======================
</span><span class="cx">         // Under OpenGL ES 2.0, we cannot use the fbo we are writting to as a texture, so we need to play ping-pong:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsblackberryLayerRenderercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/blackberry/LayerRenderer.cpp (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/blackberry/LayerRenderer.cpp        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/graphics/blackberry/LayerRenderer.cpp        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -33,12 +33,11 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><del>-
</del><span class="cx"> #include &quot;LayerRenderer.h&quot;
</span><del>-#include &quot;LayerRendererClient.h&quot;
</del><span class="cx"> 
</span><span class="cx"> #include &quot;LayerCompositingThread.h&quot;
</span><span class="cx"> #include &quot;LayerFilterRenderer.h&quot;
</span><ins>+#include &quot;LayerRendererClient.h&quot;
</ins><span class="cx"> #include &quot;TextureCacheCompositingThread.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &lt;BlackBerryPlatformGraphics.h&gt;
</span><span class="lines">@@ -242,9 +241,9 @@
</span><span class="cx">     m_clipRect = clipRect;
</span><span class="cx">     m_clipRect.intersect(targetRect);
</span><span class="cx">     m_clipRect = FloatRect(-1 + 2 * (m_clipRect.x() - targetRect.x()) / targetRect.width(),
</span><del>-                           -1 + 2 * (m_clipRect.y() - targetRect.y()) / targetRect.height(),
-                           2 * m_clipRect.width() / targetRect.width(),
-                           2 * m_clipRect.height() / targetRect.height());
</del><ins>+        -1 + 2 * (m_clipRect.y() - targetRect.y()) / targetRect.height(),
+        2 * m_clipRect.width() / targetRect.width(),
+        2 * m_clipRect.height() / targetRect.height());
</ins><span class="cx"> 
</span><span class="cx"> #if DEBUG_CLIPPING
</span><span class="cx">     printf(&quot;LayerRenderer::setViewport() m_visibleRect=(%.2f,%.2f %.2fx%.2f), m_layoutRect=(%d,%d %dx%d), m_contentsSize=(%dx%d), m_viewport=(%d,%d %dx%d), m_scissorRect=(%d,%d %dx%d), m_clipRect=(%.2f,%.2f %.2fx%.2f)\n&quot;,
</span><span class="lines">@@ -381,9 +380,9 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     FloatQuad vertices(transform.mapPoint(contents.minXMinYCorner()),
</span><del>-                       transform.mapPoint(contents.minXMaxYCorner()),
-                       transform.mapPoint(contents.maxXMaxYCorner()),
-                       transform.mapPoint(contents.maxXMinYCorner()));
</del><ins>+        transform.mapPoint(contents.minXMaxYCorner()),
+        transform.mapPoint(contents.maxXMaxYCorner()),
+        transform.mapPoint(contents.maxXMinYCorner()));
</ins><span class="cx"> 
</span><span class="cx">     if (!vertices.boundingBox().intersects(m_clipRect))
</span><span class="cx">         return;
</span><span class="lines">@@ -391,9 +390,8 @@
</span><span class="cx">     if (!contentsOpaque || opacity &lt; 1.0f) {
</span><span class="cx">         glEnable(GL_BLEND);
</span><span class="cx">         glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
</span><del>-    } else {
</del><ins>+    } else
</ins><span class="cx">         glDisable(GL_BLEND);
</span><del>-    }
</del><span class="cx"> 
</span><span class="cx">     if (BlackBerry::Platform::Graphics::lockAndBindBufferGLTexture(buffer, GL_TEXTURE_2D)) {
</span><span class="cx">         const GLES2Program&amp; program = useProgram(LayerProgramRGBA);
</span><span class="lines">@@ -410,9 +408,9 @@
</span><span class="cx"> void LayerRenderer::drawColor(const TransformationMatrix&amp; transform, const FloatRect&amp; contents, const Color&amp; color)
</span><span class="cx"> {
</span><span class="cx">     FloatQuad vertices(transform.mapPoint(contents.minXMinYCorner()),
</span><del>-                       transform.mapPoint(contents.minXMaxYCorner()),
-                       transform.mapPoint(contents.maxXMaxYCorner()),
-                       transform.mapPoint(contents.maxXMinYCorner()));
</del><ins>+        transform.mapPoint(contents.minXMaxYCorner()),
+        transform.mapPoint(contents.maxXMaxYCorner()),
+        transform.mapPoint(contents.maxXMinYCorner()));
</ins><span class="cx"> 
</span><span class="cx">     if (!vertices.boundingBox().intersects(m_clipRect))
</span><span class="cx">         return;
</span><span class="lines">@@ -994,7 +992,7 @@
</span><span class="cx">         if (preserves3D &amp;&amp; superlayerPreserves3D)
</span><span class="cx">             continue;
</span><span class="cx"> 
</span><del>-         compositeLayersRecursive(sublayer, newStencilValue, clipRect);
</del><ins>+        compositeLayersRecursive(sublayer, newStencilValue, clipRect);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (stencilClip) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsblackberryLayerWebKitThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/blackberry/LayerWebKitThread.cpp (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/blackberry/LayerWebKitThread.cpp        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/graphics/blackberry/LayerWebKitThread.cpp        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> void LayerWebKitThread::setFrame(const FloatRect&amp; rect)
</span><span class="cx"> {
</span><span class="cx">     if (rect == m_frame)
</span><del>-      return;
</del><ins>+        return;
</ins><span class="cx"> 
</span><span class="cx">     m_frame = rect;
</span><span class="cx">     setNeedsDisplay();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsblackberryMediaPlayerPrivateBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -219,9 +219,8 @@
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivate::play()
</span><span class="cx"> {
</span><del>-    if (m_platformPlayer) {
</del><ins>+    if (m_platformPlayer)
</ins><span class="cx">         m_platformPlayer-&gt;play();
</span><del>-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivate::pause()
</span><span class="lines">@@ -713,9 +712,9 @@
</span><span class="cx">     if (wait == PlatformPlayer::DialogResponse0)
</span><span class="cx">         onPauseNotified();
</span><span class="cx">     else {
</span><del>-        if (m_platformPlayer-&gt;isMetadataReady()) {
</del><ins>+        if (m_platformPlayer-&gt;isMetadataReady())
</ins><span class="cx">             m_platformPlayer-&gt;playWithMetadataReady();
</span><del>-        } else
</del><ins>+        else
</ins><span class="cx">             m_waitMetadataTimer.startOneShot(checkMetadataReadyInterval);
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersblackberryJPEGImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/blackberry/JPEGImageDecoder.cpp (149823 => 149824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/blackberry/JPEGImageDecoder.cpp        2013-05-09 18:02:34 UTC (rev 149823)
+++ trunk/Source/WebCore/platform/image-decoders/blackberry/JPEGImageDecoder.cpp        2013-05-09 18:13:53 UTC (rev 149824)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JPEGImageDecoder::JPEGImageDecoder(ImageSource::AlphaOption alphaOption,
</span><del>-                                   ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption)
</del><ins>+    ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption)
</ins><span class="cx">     : ImageDecoder(alphaOption, gammaAndColorProfileOption)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>