Changeset 76472 in webkit


Ignore:
Timestamp:
Jan 23, 2011 3:17:26 PM (13 years ago)
Author:
Patrick Gansterer
Message:

2011-01-23 Patrick Gansterer <Patrick Gansterer>

Reviewed by David Kilzer.

Add an overload to base64Encode with String output
​https://bugs.webkit.org/show_bug.cgi?id=50122

This change removes duplicated code.

  • inspector/InspectorResourceAgent.cpp: (WebCore::InspectorResourceAgent::resourceContentBase64):
  • page/DOMWindow.cpp: (WebCore::DOMWindow::btoa):
  • platform/graphics/skia/FontCustomPlatformData.cpp: (WebCore::createUniqueFontName):
  • platform/graphics/win/FontCustomPlatformData.cpp: (WebCore::createUniqueFontName):
  • platform/graphics/wince/FontCustomPlatformData.cpp: (WebCore::createUniqueFontName):
  • platform/network/cf/ResourceHandleCFNet.cpp: (WebCore::encodeBasicAuthorization):
  • platform/network/mac/ResourceHandleMac.mm: (WebCore::encodeBasicAuthorization):
  • platform/text/Base64.cpp: (WebCore::base64Encode):
  • platform/text/Base64.h: (WebCore::base64Encode):
  • platform/wince/KeygenWinCE.cpp: (WebCore::WebCore::signedPublicKeyAndChallengeString):
Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r76469 r76472  
     12011-01-23  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Add an overload to base64Encode with String output
     6        https://bugs.webkit.org/show_bug.cgi?id=50122
     7
     8        This change removes duplicated code.
     9
     10        * inspector/InspectorResourceAgent.cpp:
     11        (WebCore::InspectorResourceAgent::resourceContentBase64):
     12        * page/DOMWindow.cpp:
     13        (WebCore::DOMWindow::btoa):
     14        * platform/graphics/skia/FontCustomPlatformData.cpp:
     15        (WebCore::createUniqueFontName):
     16        * platform/graphics/win/FontCustomPlatformData.cpp:
     17        (WebCore::createUniqueFontName):
     18        * platform/graphics/wince/FontCustomPlatformData.cpp:
     19        (WebCore::createUniqueFontName):
     20        * platform/network/cf/ResourceHandleCFNet.cpp:
     21        (WebCore::encodeBasicAuthorization):
     22        * platform/network/mac/ResourceHandleMac.mm:
     23        (WebCore::encodeBasicAuthorization):
     24        * platform/text/Base64.cpp:
     25        (WebCore::base64Encode):
     26        * platform/text/Base64.h:
     27        (WebCore::base64Encode):
     28        * platform/wince/KeygenWinCE.cpp:
     29        (WebCore::WebCore::signedPublicKeyAndChallengeString):
     30
    1312011-01-23  Patrick Gansterer  <paroga@webkit.org>
    232

  • trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

    r76249 r76472  
    9696bool InspectorResourceAgent::resourceContentBase64(Frame* frame, const KURL& url, String* result)
    9797{
    98     Vector<char> out;
    9998    String textEncodingName;
    10099    RefPtr<SharedBuffer> data = InspectorResourceAgent::resourceData(frame, url, &textEncodingName);
    … …  
    104103    }
    105104
    106     base64Encode(data->buffer(), out);
    107     *result = String(out.data(), out.size());
     105    *result = base64Encode(data->buffer());
    108106    return true;
    109107}

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r76469 r76472  
    975975    }
    976976
    977     Vector<char> in;
    978     in.append(stringToEncode.characters(), stringToEncode.length());
    979     Vector<char> out;
    980 
    981     base64Encode(in, out);
    982 
    983     return String(out.data(), out.size());
     977    return base64Encode(stringToEncode.latin1());
    984978}
    985979

  • trunk/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp

    r76340 r76472  
    115115static String createUniqueFontName()
    116116{
    117     Vector<char> fontUuid(sizeof(GUID));
    118     CoCreateGuid(reinterpret_cast<GUID*>(fontUuid.data()));
    119 
    120     Vector<char> fontNameVector;
    121     base64Encode(fontUuid, fontNameVector);
    122     ASSERT(fontNameVector.size() < LF_FACESIZE);
    123     return String(fontNameVector.data(), fontNameVector.size());
     117    GUID fontUuid;
     118    CoCreateGuid(&fontUuid);
     119
     120    String fontName = base64Encode(reinterpret_cast<char*>(&fontUuid), sizeof(fontUuid));
     121    ASSERT(fontName.length() < LF_FACESIZE);
     122    return fontName;
    124123}
    125124#endif

  • trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp

    r70250 r76472  
    155155static String createUniqueFontName()
    156156{
    157     Vector<char> fontUuid(sizeof(GUID));
    158     CoCreateGuid(reinterpret_cast<GUID*>(fontUuid.data()));
    159 
    160     Vector<char> fontNameVector;
    161     base64Encode(fontUuid, fontNameVector);
    162     ASSERT(fontNameVector.size() < LF_FACESIZE);
    163     return String(fontNameVector.data(), fontNameVector.size());
     157    GUID fontUuid;
     158    CoCreateGuid(&fontUuid);
     159
     160    String fontName = base64Encode(reinterpret_cast<char*>(&fontUuid), sizeof(fontUuid));
     161    ASSERT(fontName.length() < LF_FACESIZE);
     162    return fontName;
    164163}
    165164

  • trunk/Source/WebCore/platform/graphics/wince/FontCustomPlatformData.cpp

    r70250 r76472  
    6060static String createUniqueFontName()
    6161{
    62     Vector<char> fontUuid(sizeof(GUID));
     62    GUID fontUuid;
    6363
    64     unsigned int* ptr = reinterpret_cast<unsigned int*>(fontUuid.data());
     64    unsigned int* ptr = reinterpret_cast<unsigned int*>(&fontUuid);
    6565    for (int i = 0; i < sizeof(GUID) / sizeof(int) ; ++i)
    6666        *(ptr + i) = static_cast<unsigned int>(randomNumber() * (std::numeric_limits<unsigned>::max() + 1.0));
    6767
    68     Vector<char> fontNameVector;
    69     base64Encode(fontUuid, fontNameVector);
    70     ASSERT(fontNameVector.size() < LF_FACESIZE);
    71     String fontName(fontNameVector.data(), fontNameVector.size());
     68    String fontName = base64Encode(reinterpret_cast<char*>(&fontUuid), sizeof(fontUuid));
     69    ASSERT(fontName.length() < LF_FACESIZE);
    7270    return fontName.replace('/', '_');
    7371}

  • trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

    r74943 r76472  
    127127static String encodeBasicAuthorization(const String& user, const String& password)
    128128{
    129     CString unencodedString = (user + ":" + password).utf8();
    130     Vector<char> unencoded(unencodedString.length());
    131     std::copy(unencodedString.data(), unencodedString.data() + unencodedString.length(), unencoded.begin());
    132     Vector<char> encoded;
    133     base64Encode(unencoded, encoded);
    134     return String(encoded.data(), encoded.size());
     129    return base64Encode((user + ":" + password).utf8());
    135130}
    136131

  • trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

    r74943 r76472  
    165165static String encodeBasicAuthorization(const String& user, const String& password)
    166166{
    167     CString unencodedString = (user + ":" + password).utf8();
    168     Vector<char> unencoded(unencodedString.length());
    169     std::copy(unencodedString.data(), unencodedString.data() + unencodedString.length(), unencoded.begin());
    170     Vector<char> encoded;
    171     base64Encode(unencoded, encoded);
    172     return String(encoded.data(), encoded.size());
     167    return base64Encode((user + ":" + password).utf8());
    173168}
    174169#endif

  • trunk/Source/WebCore/platform/text/Base64.cpp

    r69072 r76472  
    6161};
    6262
    63 void base64Encode(const Vector<char>& in, Vector<char>& out, bool insertLFs)
    64 {
    65     base64Encode(in.data(), in.size(), out, insertLFs);
     63String base64Encode(const char* data, unsigned length, bool insertLFs)
     64{
     65    Vector<char> result;
     66    base64Encode(data, length, result, insertLFs);
     67    return String(result.data(), result.size());
    6668}
    6769

  • trunk/Source/WebCore/platform/text/Base64.h

    r69072 r76472  
    2828#define Base64_h
    2929
    30 #include <wtf/Forward.h>
    3130#include <wtf/Vector.h>
     31#include <wtf/text/CString.h>
     32#include <wtf/text/WTFString.h>
    3233
    3334namespace WebCore {
    … …  
    3536enum Base64DecodePolicy { FailOnInvalidCharacter, IgnoreWhitespace, IgnoreInvalidCharacters };
    3637
     38void base64Encode(const char*, unsigned, Vector<char>&, bool insertLFs = false);
    3739void base64Encode(const Vector<char>&, Vector<char>&, bool insertLFs = false);
    38 void base64Encode(const char*, unsigned, Vector<char>&, bool insertLFs = false);
     40void base64Encode(const CString&, Vector<char>&, bool insertLFs = false);
     41String base64Encode(const char*, unsigned, bool insertLFs = false);
     42String base64Encode(const Vector<char>&, bool insertLFs = false);
     43String base64Encode(const CString&, bool insertLFs = false);
    3944
    4045bool base64Decode(const String&, Vector<char>&, Base64DecodePolicy = FailOnInvalidCharacter);
    … …  
    4247bool base64Decode(const char*, unsigned, Vector<char>&, Base64DecodePolicy = FailOnInvalidCharacter);
    4348
     49inline void base64Encode(const Vector<char>& in, Vector<char>& out, bool insertLFs)
     50{
     51    base64Encode(in.data(), in.size(), out, insertLFs);
    4452}
    4553
     54inline void base64Encode(const CString& in, Vector<char>& out, bool insertLFs)
     55{
     56    base64Encode(in.data(), in.length(), out, insertLFs);
     57}
     58
     59inline String base64Encode(const Vector<char>& in, bool insertLFs)
     60{
     61    return base64Encode(in.data(), in.size(), insertLFs);
     62}
     63
     64inline String base64Encode(const CString& in, bool insertLFs)
     65{
     66    return base64Encode(in.data(), in.length(), insertLFs);
     67}
     68
     69} // namespace WebCore
     70
    4671#endif // Base64_h

  • trunk/Source/WebCore/platform/wince/KeygenWinCE.cpp

    r67788 r76472  
    8181            break;
    8282
    83         Vector<char> base64;
    84         base64Encode(binary, base64);
    85         keyString = String(base64.data(), base64.size());
    86 
     83        keyString = base64Encode(binary);
    8784    } while(0);
    8885
Note: See TracChangeset for help on using the changeset viewer.