Diff
Modified: trunk/Source/WebCore/ChangeLog (149821 => 149822)
--- 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)
@@ -1,3 +1,36 @@
+2013-05-09 Mike Fenton <mifen...@rim.com>
+
+ [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:
+
2013-05-09 Chris Rogers <crog...@google.com>
Require use of AudioBus::create() to avoid ref-counting issues
Modified: trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h (149821 => 149822)
--- 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)
@@ -43,8 +43,7 @@
class ParsedCookie;
-class CookieDatabaseBackingStore : public BlackBerry::Platform::MessageClient
- , public BlackBerry::Platform::ThreadTimerClient {
+class CookieDatabaseBackingStore : public BlackBerry::Platform::MessageClient , public BlackBerry::Platform::ThreadTimerClient {
public:
static CookieDatabaseBackingStore* create() { return new CookieDatabaseBackingStore; }
Modified: trunk/Source/WebCore/platform/blackberry/CookieManager.cpp (149821 => 149822)
--- 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)
@@ -264,7 +264,7 @@
if (m_shouldDumpAllCookies) {
protocolsToSearch.append(m_managerMap.get("file"));
protocolsToSearch.append(m_managerMap.get("local"));
- }
+ }
}
Vector<String> delimitedHost;
Modified: trunk/Source/WebCore/platform/blackberry/CookieMap.h (149821 => 149822)
--- 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)
@@ -56,7 +56,7 @@
CookieMap(const String& name = "");
~CookieMap();
- unsigned int count() const { return m_cookieVector.size(); }
+ unsigned count() const { return m_cookieVector.size(); }
const String& getName() const { return m_name; }
// Return false if the candidateCookie is rejected.
Modified: trunk/Source/WebCore/platform/blackberry/CookieParser.cpp (149821 => 149822)
--- 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)
@@ -142,8 +142,7 @@
unsigned tokenStart = start;
- bool hasName = false; // This is a hack to avoid changing too much in this
- // brutally brittle code.
+ bool hasName = false; // This is a hack to avoid changing too much in this brutally brittle code.
if (tokenEnd != start) {
// There is a '=' so parse the NAME
unsigned nameEnd = tokenEnd;
@@ -232,8 +231,8 @@
length = pairEnd - tokenStart;
}
- // Detect which "cookie-av" is parsed
- // Look at the first char then parse the whole for performance issue
+ // Detect which "cookie-av" is parsed
+ // Look at the first char then parse the whole for performance issue
switch (cookie[tokenStartSvg]) {
case 'P':
case 'p' : {
@@ -425,7 +424,7 @@
// so we must remove the escape sequences.
res->setPath(decodeURLEscapeSequences(path));
}
-
+
return res;
}
Modified: trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp (149821 => 149822)
--- 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)
@@ -17,9 +17,10 @@
*/
#include "config.h"
-#include "InitializeLogging.h"
#include "Logging.h"
+#include "InitializeLogging.h"
+
#if !LOG_DISABLED
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h (149821 => 149822)
--- 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)
@@ -23,22 +23,22 @@
#include "WebPageClient.h"
namespace BlackBerry {
- namespace Platform {
- class NetworkStreamFactory;
- namespace Graphics {
- class Window;
- }
- }
+namespace Platform {
+class NetworkStreamFactory;
+namespace Graphics {
+class Window;
}
+}
+}
namespace WebCore {
- class AuthenticationChallengeClient;
- class Credential;
- class IntRect;
- class IntSize;
- class KURL;
- class PluginView;
- class ProtectionSpace;
+class AuthenticationChallengeClient;
+class Credential;
+class IntRect;
+class IntSize;
+class KURL;
+class PluginView;
+class ProtectionSpace;
}
class PageClientBlackBerry {
Modified: trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp (149821 => 149822)
--- 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)
@@ -28,10 +28,10 @@
#include "ParsedCookie.h"
#include "CookieManager.h"
-#include <wtf/CurrentTime.h>
#include "KURL.h"
#include "Logging.h"
#include <curl/curl.h>
+#include <wtf/CurrentTime.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
@@ -154,8 +154,8 @@
void ParsedCookie::appendWebCoreCookie(Vector<Cookie>& cookieVector) const
{
cookieVector.append(Cookie(String(m_name), String(m_value), String(m_domain),
- // 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));
+ // 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));
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (149821 => 149822)
--- 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)
@@ -392,14 +392,13 @@
// Center the button vertically. Round up though, so if it has to be one pixel off-center, it will
// be one pixel closer to the bottom of the field. This tends to look better with the text.
LayoutRect cancelButtonRect(cancelButtonObject->offsetFromAncestorContainer(inputRenderBox).width(),
- inputContentBox.y() + (inputContentBox.height() - cancelButtonSize + 1) / 2,
- cancelButtonSize, cancelButtonSize);
+ inputContentBox.y() + (inputContentBox.height() - cancelButtonSize + 1) / 2, cancelButtonSize, cancelButtonSize);
IntRect paintingRect = convertToPaintingRect(inputRenderBox, cancelButtonObject, cancelButtonRect, r);
static Image* cancelImage = Image::loadPlatformResource("searchCancel").leakRef();
static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelPressed").leakRef();
paintInfo.context->drawImage(isPressed(cancelButtonObject) ? cancelPressedImage : cancelImage,
- cancelButtonObject->style()->colorSpace(), paintingRect);
+ cancelButtonObject->style()->colorSpace(), paintingRect);
return false;
}
@@ -566,9 +565,9 @@
if (!isEnabled(object)) {
drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);
drawNineSlice(context, rect, ctm.xScale(), disabled.get(), largeSlice);
- } else if (isPressed(object)) {
+ } else if (isPressed(object))
drawNineSlice(context, rect, ctm.xScale(), pressed.get(), largeSlice);
- } else
+ else
drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);
context->restore();
@@ -731,9 +730,8 @@
if (isPressed(object) || isHovered(object) || isFocused(object)) {
drawControl(context, tmpRect, pressed.get());
drawControl(context, auraRect, aura.get());
- } else {
+ } else
drawControl(context, tmpRect, inactive.get());
- }
}
context->restore();
Modified: trunk/Source/WebCore/platform/blackberry/SSLKeyGeneratorBlackBerry.cpp (149821 => 149822)
--- 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)
@@ -31,7 +31,7 @@
notImplemented();
}
-String signedPublicKeyAndChallengeString(unsigned int, String const&, KURL const&)
+String signedPublicKeyAndChallengeString(unsigned, String const&, KURL const&)
{
notImplemented();
return String();
Modified: trunk/Source/WebCore/platform/blackberry/ScrollAnimatorBlackBerry.h (149821 => 149822)
--- 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)
@@ -1,6 +1,23 @@
+/*
+ * 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
+ */
#ifndef ScrollAnimatorBlackBerry_h
-#define ScrollAnimatorBlackberry_h
+#define ScrollAnimatorBlackBerry_h
#if ENABLE(SMOOTH_SCROLLING)
