Changeset 149823 in webkit


Ignore:
Timestamp:
May 9, 2013 11:02:34 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/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):

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r149822 r149823  
     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/network/blackberry
     9        to match check-webkit-style updates.
     10
     11        * platform/network/blackberry/NetworkJob.cpp:
     12        (WebCore::NetworkJob::initialize):
     13        (WebCore::NetworkJob::handleSetCookieHeader):
     14        (WebCore::NetworkJob::sendResponseIfNeeded):
     15        (WebCore::NetworkJob::shouldSendClientData):
     16        * platform/network/blackberry/NetworkJob.h:
     17        (NetworkJob):
     18        * platform/network/blackberry/NetworkManager.cpp:
     19        (WebCore::NetworkManager::startJob):
     20        * platform/network/blackberry/rss/RSSFilterStream.cpp:
     21        (WebCore::isRSSContent):
     22        (WebCore::transcode):
     23
    1242013-05-09  Mike Fenton  <mifenton@rim.com>
    225
  • trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp

    r144326 r149823  
    117117
    118118bool NetworkJob::initialize(int playerId,
    119                             const String& pageGroupName,
    120                             const KURL& url,
    121                             const BlackBerry::Platform::NetworkRequest& request,
    122                             PassRefPtr<ResourceHandle> handle,
    123                             BlackBerry::Platform::NetworkStreamFactory* streamFactory,
    124                             Frame* frame,
    125                             int deferLoadingCount,
    126                             int redirectCount)
     119    const String& pageGroupName,
     120    const KURL& url,
     121    const BlackBerry::Platform::NetworkRequest& request,
     122    PassRefPtr<ResourceHandle> handle,
     123    BlackBerry::Platform::NetworkStreamFactory* streamFactory,
     124    Frame* frame,
     125    int deferLoadingCount,
     126    int redirectCount)
    127127{
    128128    BLACKBERRY_ASSERT(handle);
     
    170170    BlackBerry::Platform::NetworkRequest::TargetType targetType = request.getTargetType();
    171171    if ((targetType == BlackBerry::Platform::NetworkRequest::TargetIsMainFrame
    172          || targetType == BlackBerry::Platform::NetworkRequest::TargetIsSubframe)
    173             && !m_isOverrideContentType) {
     172        || targetType == BlackBerry::Platform::NetworkRequest::TargetIsSubframe)
     173        && !m_isOverrideContentType) {
    174174        RSSFilterStream* filter = new RSSFilterStream();
    175175        filter->setWrappedStream(wrappedStream);
     
    457457    CookieManager& manager = cookieManager();
    458458    if ((manager.cookiePolicy() == CookieStorageAcceptPolicyOnlyFromMainDocumentDomain)
    459       && (m_handle->firstRequest().firstPartyForCookies() != url)
    460       && manager.getCookie(url, WithHttpOnlyCookies).isEmpty())
     459        && (m_handle->firstRequest().firstPartyForCookies() != url)
     460        && manager.getCookie(url, WithHttpOnlyCookies).isEmpty())
    461461        return;
    462462    manager.setCookies(url, value);
     
    750750        } else {
    751751            if (urlFilename.reverseFind('.') == notFound && !mimeExtension.isEmpty())
    752                suggestedFilename = urlFilename + '.' + mimeExtension;
     752                suggestedFilename = urlFilename + '.' + mimeExtension;
    753753            else
    754                suggestedFilename = urlFilename;
     754                suggestedFilename = urlFilename;
    755755        }
    756756    }
     
    10051005{
    10061006    return (!isRedirect(m_extendedStatusCode) || !m_response.httpHeaderFields().contains("Location"))
    1007            && !m_needsRetryAsFTPDirectory;
     1007        && !m_needsRetryAsFTPDirectory;
    10081008}
    10091009
  • trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h

    r143796 r149823  
    5454
    5555    bool initialize(int playerId,
    56                     const String& pageGroupName,
    57                     const KURL&,
    58                     const BlackBerry::Platform::NetworkRequest&,
    59                     PassRefPtr<ResourceHandle>,
    60                     BlackBerry::Platform::NetworkStreamFactory*,
    61                     Frame*,
    62                     int deferLoadingCount,
    63                     int redirectCount);
     56        const String& pageGroupName,
     57        const KURL&,
     58        const BlackBerry::Platform::NetworkRequest&,
     59        PassRefPtr<ResourceHandle>,
     60        BlackBerry::Platform::NetworkStreamFactory*,
     61        Frame*,
     62        int deferLoadingCount,
     63        int redirectCount);
    6464    PassRefPtr<ResourceHandle> handle() const { return m_handle; }
    6565#ifndef NDEBUG
  • trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp

    r149769 r149823  
    159159
    160160    const String& documentUrl = frame->document()->url().string();
    161     if (!documentUrl.isEmpty()) {
     161    if (!documentUrl.isEmpty())
    162162        platformRequest.setReferrer(documentUrl);
    163     }
    164163
    165164    platformRequest.setSecurityOrigin(frame->document()->securityOrigin()->toRawString());
  • trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp

    r149769 r149823  
    8686{
    8787    return type == RSSFilterStream::TypeRSS10
    88             || type == RSSFilterStream::TypeRSS20
    89             || type == RSSFilterStream::TypeRSSAtom;
     88        || type == RSSFilterStream::TypeRSS20
     89        || type == RSSFilterStream::TypeRSSAtom;
    9090}
    9191
     
    336336
    337337static TranscodeResult transcode(const char* sourceEncoding,
    338                                  const char* targetEncoding,
    339                                  const char*& sourceStart,
    340                                  int sourceLength,
    341                                  char*& targetStart,
    342                                  unsigned int targetLength)
     338    const char* targetEncoding,
     339    const char*& sourceStart,
     340    int sourceLength,
     341    char*& targetStart,
     342    unsigned targetLength)
    343343{
    344344    TextEncoding textEncodingSource(sourceEncoding);
Note: See TracChangeset for help on using the changeset viewer.