<!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>[149822] 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/149822">149822</a></dd>
<dt>Author</dt> <dd>mifenton@rim.com</dd>
<dt>Date</dt> <dd>2013-05-09 10:59:20 -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/blackberry to match check-webkit-style updates.

No functional changes.

* platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h:
* platform/blackberry/CookieManager.cpp:
(WebCore::CookieManager::getRawCookies):
* platform/blackberry/CookieMap.h:
(WebCore::CookieMap::count):
* platform/blackberry/CookieParser.cpp:
(WebCore::CookieParser::parseOneCookie):
* platform/blackberry/LoggingBlackBerry.cpp:
* platform/blackberry/PageClientBlackBerry.h:
(Platform):
(Graphics):
(WebCore):
* platform/blackberry/ParsedCookie.cpp:
(WebCore::ParsedCookie::appendWebCoreCookie):
* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore::RenderThemeBlackBerry::paintSearchFieldCancelButton):
(WebCore::RenderThemeBlackBerry::paintButton):
(WebCore::RenderThemeBlackBerry::paintSliderThumb):
* platform/blackberry/SSLKeyGeneratorBlackBerry.cpp:
(WebCore::signedPublicKeyAndChallengeString):
* platform/blackberry/ScrollAnimatorBlackBerry.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryCookieDatabaseBackingStoreCookieDatabaseBackingStoreh">trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryCookieManagercpp">trunk/Source/WebCore/platform/blackberry/CookieManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryCookieMaph">trunk/Source/WebCore/platform/blackberry/CookieMap.h</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryCookieParsercpp">trunk/Source/WebCore/platform/blackberry/CookieParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryLoggingBlackBerrycpp">trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryPageClientBlackBerryh">trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryParsedCookiecpp">trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryRenderThemeBlackBerrycpp">trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberrySSLKeyGeneratorBlackBerrycpp">trunk/Source/WebCore/platform/blackberry/SSLKeyGeneratorBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryScrollAnimatorBlackBerryh">trunk/Source/WebCore/platform/blackberry/ScrollAnimatorBlackBerry.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/ChangeLog        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+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.
+
+        Update WebCore/platform/blackberry to match check-webkit-style updates.
+
+        No functional changes.
+
+        * platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h:
+        * platform/blackberry/CookieManager.cpp:
+        (WebCore::CookieManager::getRawCookies):
+        * platform/blackberry/CookieMap.h:
+        (WebCore::CookieMap::count):
+        * platform/blackberry/CookieParser.cpp:
+        (WebCore::CookieParser::parseOneCookie):
+        * platform/blackberry/LoggingBlackBerry.cpp:
+        * platform/blackberry/PageClientBlackBerry.h:
+        (Platform):
+        (Graphics):
+        (WebCore):
+        * platform/blackberry/ParsedCookie.cpp:
+        (WebCore::ParsedCookie::appendWebCoreCookie):
+        * platform/blackberry/RenderThemeBlackBerry.cpp:
+        (WebCore::RenderThemeBlackBerry::paintSearchFieldCancelButton):
+        (WebCore::RenderThemeBlackBerry::paintButton):
+        (WebCore::RenderThemeBlackBerry::paintSliderThumb):
+        * platform/blackberry/SSLKeyGeneratorBlackBerry.cpp:
+        (WebCore::signedPublicKeyAndChallengeString):
+        * platform/blackberry/ScrollAnimatorBlackBerry.h:
+
</ins><span class="cx"> 2013-05-09  Chris Rogers  &lt;crogers@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Require use of AudioBus::create() to avoid ref-counting issues
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryCookieDatabaseBackingStoreCookieDatabaseBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -43,8 +43,7 @@
</span><span class="cx"> 
</span><span class="cx"> class ParsedCookie;
</span><span class="cx"> 
</span><del>-class CookieDatabaseBackingStore : public BlackBerry::Platform::MessageClient
-                                 , public BlackBerry::Platform::ThreadTimerClient {
</del><ins>+class CookieDatabaseBackingStore : public BlackBerry::Platform::MessageClient , public BlackBerry::Platform::ThreadTimerClient {
</ins><span class="cx"> public:
</span><span class="cx">     static CookieDatabaseBackingStore* create() { return new CookieDatabaseBackingStore; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/CookieManager.cpp (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/CookieManager.cpp        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/CookieManager.cpp        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx">         if (m_shouldDumpAllCookies) {
</span><span class="cx">             protocolsToSearch.append(m_managerMap.get(&quot;file&quot;));
</span><span class="cx">             protocolsToSearch.append(m_managerMap.get(&quot;local&quot;));
</span><del>-       }
</del><ins>+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;String&gt; delimitedHost;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryCookieMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/CookieMap.h (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/CookieMap.h        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/CookieMap.h        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">     CookieMap(const String&amp; name = &quot;&quot;);
</span><span class="cx">     ~CookieMap();
</span><span class="cx"> 
</span><del>-    unsigned int count() const { return m_cookieVector.size(); }
</del><ins>+    unsigned count() const { return m_cookieVector.size(); }
</ins><span class="cx">     const String&amp; getName() const { return m_name; }
</span><span class="cx"> 
</span><span class="cx">     // Return false if the candidateCookie is rejected.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryCookieParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/CookieParser.cpp (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/CookieParser.cpp        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/CookieParser.cpp        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -142,8 +142,7 @@
</span><span class="cx"> 
</span><span class="cx">     unsigned tokenStart = start;
</span><span class="cx"> 
</span><del>-    bool hasName = false; // This is a hack to avoid changing too much in this
-                          // brutally brittle code.
</del><ins>+    bool hasName = false; // This is a hack to avoid changing too much in this brutally brittle code.
</ins><span class="cx">     if (tokenEnd != start) {
</span><span class="cx">         // There is a '=' so parse the NAME
</span><span class="cx">         unsigned nameEnd = tokenEnd;
</span><span class="lines">@@ -232,8 +231,8 @@
</span><span class="cx">             length = pairEnd - tokenStart;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-       // Detect which &quot;cookie-av&quot; is parsed
-       // Look at the first char then parse the whole for performance issue
</del><ins>+        // Detect which &quot;cookie-av&quot; is parsed
+        // Look at the first char then parse the whole for performance issue
</ins><span class="cx">         switch (cookie[tokenStartSvg]) {
</span><span class="cx">         case 'P':
</span><span class="cx">         case 'p' : {
</span><span class="lines">@@ -425,7 +424,7 @@
</span><span class="cx">         // so we must remove the escape sequences.
</span><span class="cx">         res-&gt;setPath(decodeURLEscapeSequences(path));
</span><span class="cx">     }
</span><del>- 
</del><ins>+
</ins><span class="cx">     return res;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryLoggingBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -17,9 +17,10 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #include &quot;config.h&quot;
</span><del>-#include &quot;InitializeLogging.h&quot;
</del><span class="cx"> #include &quot;Logging.h&quot;
</span><span class="cx"> 
</span><ins>+#include &quot;InitializeLogging.h&quot;
+
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> 
</span><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryPageClientBlackBerryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -23,22 +23,22 @@
</span><span class="cx"> #include &quot;WebPageClient.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace BlackBerry {
</span><del>-    namespace Platform {
-        class NetworkStreamFactory;
-        namespace Graphics {
-            class Window;
-        }
-    }
</del><ins>+namespace Platform {
+class NetworkStreamFactory;
+namespace Graphics {
+class Window;
</ins><span class="cx"> }
</span><ins>+}
+}
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><del>-    class AuthenticationChallengeClient;
-    class Credential;
-    class IntRect;
-    class IntSize;
-    class KURL;
-    class PluginView;
-    class ProtectionSpace;
</del><ins>+class AuthenticationChallengeClient;
+class Credential;
+class IntRect;
+class IntSize;
+class KURL;
+class PluginView;
+class ProtectionSpace;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> class PageClientBlackBerry {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryParsedCookiecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx"> #include &quot;ParsedCookie.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CookieManager.h&quot;
</span><del>-#include &lt;wtf/CurrentTime.h&gt;
</del><span class="cx"> #include &quot;KURL.h&quot;
</span><span class="cx"> #include &quot;Logging.h&quot;
</span><span class="cx"> #include &lt;curl/curl.h&gt;
</span><ins>+#include &lt;wtf/CurrentTime.h&gt;
</ins><span class="cx"> #include &lt;wtf/text/CString.h&gt;
</span><span class="cx"> #include &lt;wtf/text/StringBuilder.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -154,8 +154,8 @@
</span><span class="cx"> void ParsedCookie::appendWebCoreCookie(Vector&lt;Cookie&gt;&amp; cookieVector) const
</span><span class="cx"> {
</span><span class="cx">     cookieVector.append(Cookie(String(m_name), String(m_value), String(m_domain),
</span><del>-            // We multiply m_expiry by 1000 to convert from seconds to milliseconds.
-            // This value is passed to Web Inspector and used in the JavaScript Date constructor.
-            String(m_path), (m_expiry * 1000), m_isHttpOnly, m_isSecure, m_isSession));
</del><ins>+        // We multiply m_expiry by 1000 to convert from seconds to milliseconds.
+        // This value is passed to Web Inspector and used in the JavaScript Date constructor.
+        String(m_path), (m_expiry * 1000), m_isHttpOnly, m_isSecure, m_isSession));
</ins><span class="cx"> }
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryRenderThemeBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -392,14 +392,13 @@
</span><span class="cx">     // Center the button vertically. Round up though, so if it has to be one pixel off-center, it will
</span><span class="cx">     // be one pixel closer to the bottom of the field. This tends to look better with the text.
</span><span class="cx">     LayoutRect cancelButtonRect(cancelButtonObject-&gt;offsetFromAncestorContainer(inputRenderBox).width(),
</span><del>-                                inputContentBox.y() + (inputContentBox.height() - cancelButtonSize + 1) / 2,
-                                cancelButtonSize, cancelButtonSize);
</del><ins>+        inputContentBox.y() + (inputContentBox.height() - cancelButtonSize + 1) / 2, cancelButtonSize, cancelButtonSize);
</ins><span class="cx">     IntRect paintingRect = convertToPaintingRect(inputRenderBox, cancelButtonObject, cancelButtonRect, r);
</span><span class="cx"> 
</span><span class="cx">     static Image* cancelImage = Image::loadPlatformResource(&quot;searchCancel&quot;).leakRef();
</span><span class="cx">     static Image* cancelPressedImage = Image::loadPlatformResource(&quot;searchCancelPressed&quot;).leakRef();
</span><span class="cx">     paintInfo.context-&gt;drawImage(isPressed(cancelButtonObject) ? cancelPressedImage : cancelImage,
</span><del>-                                 cancelButtonObject-&gt;style()-&gt;colorSpace(), paintingRect);
</del><ins>+        cancelButtonObject-&gt;style()-&gt;colorSpace(), paintingRect);
</ins><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -566,9 +565,9 @@
</span><span class="cx">     if (!isEnabled(object)) {
</span><span class="cx">         drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);
</span><span class="cx">         drawNineSlice(context, rect, ctm.xScale(), disabled.get(), largeSlice);
</span><del>-    } else if (isPressed(object)) {
</del><ins>+    } else if (isPressed(object))
</ins><span class="cx">         drawNineSlice(context, rect, ctm.xScale(), pressed.get(), largeSlice);
</span><del>-    } else
</del><ins>+    else
</ins><span class="cx">         drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);
</span><span class="cx"> 
</span><span class="cx">     context-&gt;restore();
</span><span class="lines">@@ -731,9 +730,8 @@
</span><span class="cx">         if (isPressed(object) || isHovered(object) || isFocused(object)) {
</span><span class="cx">             drawControl(context, tmpRect, pressed.get());
</span><span class="cx">             drawControl(context, auraRect, aura.get());
</span><del>-        } else {
</del><ins>+        } else
</ins><span class="cx">             drawControl(context, tmpRect, inactive.get());
</span><del>-        }
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     context-&gt;restore();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberrySSLKeyGeneratorBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/SSLKeyGeneratorBlackBerry.cpp (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/SSLKeyGeneratorBlackBerry.cpp        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/SSLKeyGeneratorBlackBerry.cpp        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-String signedPublicKeyAndChallengeString(unsigned int, String const&amp;, KURL const&amp;)
</del><ins>+String signedPublicKeyAndChallengeString(unsigned, String const&amp;, KURL const&amp;)
</ins><span class="cx"> {
</span><span class="cx">     notImplemented();
</span><span class="cx">     return String();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryScrollAnimatorBlackBerryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/ScrollAnimatorBlackBerry.h (149821 => 149822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/ScrollAnimatorBlackBerry.h        2013-05-09 17:40:39 UTC (rev 149821)
+++ trunk/Source/WebCore/platform/blackberry/ScrollAnimatorBlackBerry.h        2013-05-09 17:59:20 UTC (rev 149822)
</span><span class="lines">@@ -1,6 +1,23 @@
</span><ins>+/*
+ * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
</ins><span class="cx"> 
</span><span class="cx"> #ifndef ScrollAnimatorBlackBerry_h
</span><del>-#define ScrollAnimatorBlackberry_h
</del><ins>+#define ScrollAnimatorBlackBerry_h
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(SMOOTH_SCROLLING)
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>