Changeset 149822 in webkit


Ignore:
Timestamp:
May 9, 2013 10:59:20 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/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:
Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r149817 r149822  
     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/blackberry to match check-webkit-style updates.
     9
     10        No functional changes.
     11
     12        * platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h:
     13        * platform/blackberry/CookieManager.cpp:
     14        (WebCore::CookieManager::getRawCookies):
     15        * platform/blackberry/CookieMap.h:
     16        (WebCore::CookieMap::count):
     17        * platform/blackberry/CookieParser.cpp:
     18        (WebCore::CookieParser::parseOneCookie):
     19        * platform/blackberry/LoggingBlackBerry.cpp:
     20        * platform/blackberry/PageClientBlackBerry.h:
     21        (Platform):
     22        (Graphics):
     23        (WebCore):
     24        * platform/blackberry/ParsedCookie.cpp:
     25        (WebCore::ParsedCookie::appendWebCoreCookie):
     26        * platform/blackberry/RenderThemeBlackBerry.cpp:
     27        (WebCore::RenderThemeBlackBerry::paintSearchFieldCancelButton):
     28        (WebCore::RenderThemeBlackBerry::paintButton):
     29        (WebCore::RenderThemeBlackBerry::paintSliderThumb):
     30        * platform/blackberry/SSLKeyGeneratorBlackBerry.cpp:
     31        (WebCore::signedPublicKeyAndChallengeString):
     32        * platform/blackberry/ScrollAnimatorBlackBerry.h:
     33
    1342013-05-09  Chris Rogers  <crogers@google.com>
    235

  • trunk/Source/WebCore/platform/blackberry/CookieDatabaseBackingStore/CookieDatabaseBackingStore.h

    r145163 r149822  
    4444class ParsedCookie;
    4545
    46 class CookieDatabaseBackingStore : public BlackBerry::Platform::MessageClient
    47                                  , public BlackBerry::Platform::ThreadTimerClient {
     46class CookieDatabaseBackingStore : public BlackBerry::Platform::MessageClient , public BlackBerry::Platform::ThreadTimerClient {
    4847public:
    4948    static CookieDatabaseBackingStore* create() { return new CookieDatabaseBackingStore; }

  • trunk/Source/WebCore/platform/blackberry/CookieManager.cpp

    r149769 r149822  
    265265            protocolsToSearch.append(m_managerMap.get("file"));
    266266            protocolsToSearch.append(m_managerMap.get("local"));
    267        }
     267        }
    268268    }
    269269

  • trunk/Source/WebCore/platform/blackberry/CookieMap.h

    r145163 r149822  
    5757    ~CookieMap();
    5858
    59     unsigned int count() const { return m_cookieVector.size(); }
     59    unsigned count() const { return m_cookieVector.size(); }
    6060    const String& getName() const { return m_name; }
    6161

  • trunk/Source/WebCore/platform/blackberry/CookieParser.cpp

    r149769 r149822  
    143143    unsigned tokenStart = start;
    144144
    145     bool hasName = false; // This is a hack to avoid changing too much in this
    146                           // brutally brittle code.
     145    bool hasName = false; // This is a hack to avoid changing too much in this brutally brittle code.
    147146    if (tokenEnd != start) {
    148147        // There is a '=' so parse the NAME
    … …  
    233232        }
    234233
    235        // Detect which "cookie-av" is parsed
    236        // Look at the first char then parse the whole for performance issue
     234        // Detect which "cookie-av" is parsed
     235        // Look at the first char then parse the whole for performance issue
    237236        switch (cookie[tokenStartSvg]) {
    238237        case 'P':
    … …  
    426425        res->setPath(decodeURLEscapeSequences(path));
    427426    }
    428  
     427
    429428    return res;
    430429}

  • trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp

    r137486 r149822  
    1818
    1919#include "config.h"
     20#include "Logging.h"
     21
    2022#include "InitializeLogging.h"
    21 #include "Logging.h"
    2223
    2324#if !LOG_DISABLED

  • trunk/Source/WebCore/platform/blackberry/PageClientBlackBerry.h

    r131014 r149822  
    2424
    2525namespace BlackBerry {
    26     namespace Platform {
    27         class NetworkStreamFactory;
    28         namespace Graphics {
    29             class Window;
    30         }
    31     }
     26namespace Platform {
     27class NetworkStreamFactory;
     28namespace Graphics {
     29class Window;
     30}
     31}
    3232}
    3333
    3434namespace WebCore {
    35     class AuthenticationChallengeClient;
    36     class Credential;
    37     class IntRect;
    38     class IntSize;
    39     class KURL;
    40     class PluginView;
    41     class ProtectionSpace;
     35class AuthenticationChallengeClient;
     36class Credential;
     37class IntRect;
     38class IntSize;
     39class KURL;
     40class PluginView;
     41class ProtectionSpace;
    4242}
    4343

  • trunk/Source/WebCore/platform/blackberry/ParsedCookie.cpp

    r145163 r149822  
    2929
    3030#include "CookieManager.h"
    31 #include <wtf/CurrentTime.h>
    3231#include "KURL.h"
    3332#include "Logging.h"
    3433#include <curl/curl.h>
     34#include <wtf/CurrentTime.h>
    3535#include <wtf/text/CString.h>
    3636#include <wtf/text/StringBuilder.h>
    … …  
    155155{
    156156    cookieVector.append(Cookie(String(m_name), String(m_value), String(m_domain),
    157             // We multiply m_expiry by 1000 to convert from seconds to milliseconds.
    158             // This value is passed to Web Inspector and used in the JavaScript Date constructor.
    159             String(m_path), (m_expiry * 1000), m_isHttpOnly, m_isSecure, m_isSession));
     157        // We multiply m_expiry by 1000 to convert from seconds to milliseconds.
     158        // This value is passed to Web Inspector and used in the JavaScript Date constructor.
     159        String(m_path), (m_expiry * 1000), m_isHttpOnly, m_isSecure, m_isSession));
    160160}
    161161} // namespace WebCore

  • trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp

    r149624 r149822  
    393393    // be one pixel closer to the bottom of the field. This tends to look better with the text.
    394394    LayoutRect cancelButtonRect(cancelButtonObject->offsetFromAncestorContainer(inputRenderBox).width(),
    395                                 inputContentBox.y() + (inputContentBox.height() - cancelButtonSize + 1) / 2,
    396                                 cancelButtonSize, cancelButtonSize);
     395        inputContentBox.y() + (inputContentBox.height() - cancelButtonSize + 1) / 2, cancelButtonSize, cancelButtonSize);
    397396    IntRect paintingRect = convertToPaintingRect(inputRenderBox, cancelButtonObject, cancelButtonRect, r);
    398397
    … …  
    400399    static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelPressed").leakRef();
    401400    paintInfo.context->drawImage(isPressed(cancelButtonObject) ? cancelPressedImage : cancelImage,
    402                                  cancelButtonObject->style()->colorSpace(), paintingRect);
     401        cancelButtonObject->style()->colorSpace(), paintingRect);
    403402    return false;
    404403}
    … …  
    567566        drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);
    568567        drawNineSlice(context, rect, ctm.xScale(), disabled.get(), largeSlice);
    569     } else if (isPressed(object)) {
     568    } else if (isPressed(object))
    570569        drawNineSlice(context, rect, ctm.xScale(), pressed.get(), largeSlice);
    571     } else
     570    else
    572571        drawNineSlice(context, rect, ctm.xScale(), inactive.get(), largeSlice);
    573572
    … …  
    732731            drawControl(context, tmpRect, pressed.get());
    733732            drawControl(context, auraRect, aura.get());
    734         } else {
     733        } else
    735734            drawControl(context, tmpRect, inactive.get());
    736         }
    737735    }
    738736

  • trunk/Source/WebCore/platform/blackberry/SSLKeyGeneratorBlackBerry.cpp

    r127757 r149822  
    3232}
    3333
    34 String signedPublicKeyAndChallengeString(unsigned int, String const&, KURL const&)
     34String signedPublicKeyAndChallengeString(unsigned, String const&, KURL const&)
    3535{
    3636    notImplemented();

  • trunk/Source/WebCore/platform/blackberry/ScrollAnimatorBlackBerry.h

    r115347 r149822  
     1/*
     2 * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
     3 *
     4 * This library is free software; you can redistribute it and/or
     5 * modify it under the terms of the GNU Lesser General Public
     6 * License as published by the Free Software Foundation; either
     7 * version 2 of the License, or (at your option) any later version.
     8 *
     9 * This library is distributed in the hope that it will be useful,
     10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     12 * Lesser General Public License for more details.
     13 *
     14 * You should have received a copy of the GNU Lesser General Public
     15 * License along with this library; if not, write to the Free Software
     16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
     17 */
    118
    219#ifndef ScrollAnimatorBlackBerry_h
    3 #define ScrollAnimatorBlackberry_h
     20#define ScrollAnimatorBlackBerry_h
    421
    522#if ENABLE(SMOOTH_SCROLLING)
Note: See TracChangeset for help on using the changeset viewer.