Diff
Modified: trunk/Source/WebCore/ChangeLog (149822 => 149823)
--- trunk/Source/WebCore/ChangeLog 2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/ChangeLog 2013-05-09 18:02:34 UTC (rev 149823)
@@ -5,6 +5,29 @@
Reviewed by Rob Buis.
+ Update WebCore/platform/network/blackberry
+ to match check-webkit-style updates.
+
+ * platform/network/blackberry/NetworkJob.cpp:
+ (WebCore::NetworkJob::initialize):
+ (WebCore::NetworkJob::handleSetCookieHeader):
+ (WebCore::NetworkJob::sendResponseIfNeeded):
+ (WebCore::NetworkJob::shouldSendClientData):
+ * platform/network/blackberry/NetworkJob.h:
+ (NetworkJob):
+ * platform/network/blackberry/NetworkManager.cpp:
+ (WebCore::NetworkManager::startJob):
+ * platform/network/blackberry/rss/RSSFilterStream.cpp:
+ (WebCore::isRSSContent):
+ (WebCore::transcode):
+
+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.
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (149822 => 149823)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2013-05-09 18:02:34 UTC (rev 149823)
@@ -116,14 +116,14 @@
}
bool NetworkJob::initialize(int playerId,
- const String& pageGroupName,
- const KURL& url,
- const BlackBerry::Platform::NetworkRequest& request,
- PassRefPtr<ResourceHandle> handle,
- BlackBerry::Platform::NetworkStreamFactory* streamFactory,
- Frame* frame,
- int deferLoadingCount,
- int redirectCount)
+ const String& pageGroupName,
+ const KURL& url,
+ const BlackBerry::Platform::NetworkRequest& request,
+ PassRefPtr<ResourceHandle> handle,
+ BlackBerry::Platform::NetworkStreamFactory* streamFactory,
+ Frame* frame,
+ int deferLoadingCount,
+ int redirectCount)
{
BLACKBERRY_ASSERT(handle);
BLACKBERRY_ASSERT(frame);
@@ -169,8 +169,8 @@
BlackBerry::Platform::NetworkRequest::TargetType targetType = request.getTargetType();
if ((targetType == BlackBerry::Platform::NetworkRequest::TargetIsMainFrame
- || targetType == BlackBerry::Platform::NetworkRequest::TargetIsSubframe)
- && !m_isOverrideContentType) {
+ || targetType == BlackBerry::Platform::NetworkRequest::TargetIsSubframe)
+ && !m_isOverrideContentType) {
RSSFilterStream* filter = new RSSFilterStream();
filter->setWrappedStream(wrappedStream);
wrappedStream = filter;
@@ -456,8 +456,8 @@
KURL url = ""
CookieManager& manager = cookieManager();
if ((manager.cookiePolicy() == CookieStorageAcceptPolicyOnlyFromMainDocumentDomain)
- && (m_handle->firstRequest().firstPartyForCookies() != url)
- && manager.getCookie(url, WithHttpOnlyCookies).isEmpty())
+ && (m_handle->firstRequest().firstPartyForCookies() != url)
+ && manager.getCookie(url, WithHttpOnlyCookies).isEmpty())
return;
manager.setCookies(url, value);
}
@@ -749,9 +749,9 @@
suggestedFilename = String(BlackBerry::Platform::LocalizeResource::getString(BlackBerry::Platform::FILENAME_UNTITLED)) + "." + mimeExtension;
} else {
if (urlFilename.reverseFind('.') == notFound && !mimeExtension.isEmpty())
- suggestedFilename = urlFilename + '.' + mimeExtension;
+ suggestedFilename = urlFilename + '.' + mimeExtension;
else
- suggestedFilename = urlFilename;
+ suggestedFilename = urlFilename;
}
}
m_response.setSuggestedFilename(suggestedFilename);
@@ -1004,7 +1004,7 @@
bool NetworkJob::shouldSendClientData() const
{
return (!isRedirect(m_extendedStatusCode) || !m_response.httpHeaderFields().contains("Location"))
- && !m_needsRetryAsFTPDirectory;
+ && !m_needsRetryAsFTPDirectory;
}
void NetworkJob::fireDeleteJobTimer(Timer<NetworkJob>*)
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h (149822 => 149823)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h 2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h 2013-05-09 18:02:34 UTC (rev 149823)
@@ -53,14 +53,14 @@
~NetworkJob();
bool initialize(int playerId,
- const String& pageGroupName,
- const KURL&,
- const BlackBerry::Platform::NetworkRequest&,
- PassRefPtr<ResourceHandle>,
- BlackBerry::Platform::NetworkStreamFactory*,
- Frame*,
- int deferLoadingCount,
- int redirectCount);
+ const String& pageGroupName,
+ const KURL&,
+ const BlackBerry::Platform::NetworkRequest&,
+ PassRefPtr<ResourceHandle>,
+ BlackBerry::Platform::NetworkStreamFactory*,
+ Frame*,
+ int deferLoadingCount,
+ int redirectCount);
PassRefPtr<ResourceHandle> handle() const { return m_handle; }
#ifndef NDEBUG
bool isRunning() const { return m_isRunning; }
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp (149822 => 149823)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp 2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp 2013-05-09 18:02:34 UTC (rev 149823)
@@ -158,9 +158,8 @@
request.initializePlatformRequest(platformRequest, frame->loader() && frame->loader()->client() && static_cast<FrameLoaderClientBlackBerry*>(frame->loader()->client())->cookiesEnabled(), isInitial, rereadCookies);
const String& documentUrl = frame->document()->url().string();
- if (!documentUrl.isEmpty()) {
+ if (!documentUrl.isEmpty())
platformRequest.setReferrer(documentUrl);
- }
platformRequest.setSecurityOrigin(frame->document()->securityOrigin()->toRawString());
Modified: trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp (149822 => 149823)
--- trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp 2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp 2013-05-09 18:02:34 UTC (rev 149823)
@@ -85,8 +85,8 @@
static inline bool isRSSContent(RSSFilterStream::ResourceType type)
{
return type == RSSFilterStream::TypeRSS10
- || type == RSSFilterStream::TypeRSS20
- || type == RSSFilterStream::TypeRSSAtom;
+ || type == RSSFilterStream::TypeRSS20
+ || type == RSSFilterStream::TypeRSSAtom;
}
static RSSFilterStream::ResourceType RSSTypeFromContentType(const std::string& contentType)
@@ -335,11 +335,11 @@
};
static TranscodeResult transcode(const char* sourceEncoding,
- const char* targetEncoding,
- const char*& sourceStart,
- int sourceLength,
- char*& targetStart,
- unsigned int targetLength)
+ const char* targetEncoding,
+ const char*& sourceStart,
+ int sourceLength,
+ char*& targetStart,
+ unsigned targetLength)
{
TextEncoding textEncodingSource(sourceEncoding);
if (!textEncodingSource.isValid())
