Changeset 40412 in webkit


Ignore:
Timestamp:
Jan 30, 2009 11:57:33 AM (15 years ago)
Author:
andersca@apple.com
Message:

2009-01-30 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Add IdentifierRep which will be used by both plug-in implementations.

  • GNUmakefile.am:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • bridge/IdentifierRep.cpp: Added. (WebCore::IdentifierRep::IdentifierRep): (WebCore::IdentifierRep::): (WebCore::intIdentifierMap): (WebCore::identifierRep): (WebCore::stringIdentifierMap):
  • bridge/IdentifierRep.h: Added.
  • bridge/c/c_utility.h:
  • platform/text/PlatformString.h:
  • platform/text/String.cpp: (WebCore::String::fromUTF8WithLatin1Fallback):
Location:
trunk/WebCore
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r40411 r40412  
     12009-01-30  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Add IdentifierRep which will be used by both plug-in implementations.
     6
     7        * GNUmakefile.am:
     8        * WebCore.vcproj/WebCore.vcproj:
     9        * WebCore.xcodeproj/project.pbxproj:
     10        * bridge/IdentifierRep.cpp: Added.
     11        (WebCore::IdentifierRep::IdentifierRep):
     12        (WebCore::IdentifierRep::):
     13        (WebCore::intIdentifierMap):
     14        (WebCore::identifierRep):
     15        (WebCore::stringIdentifierMap):
     16        * bridge/IdentifierRep.h: Added.
     17        * bridge/c/c_utility.h:
     18        * platform/text/PlatformString.h:
     19        * platform/text/String.cpp:
     20        (WebCore::String::fromUTF8WithLatin1Fallback):
     21
    1222009-01-30  Sam Weinig  <sam@webkit.org>
    223

  • trunk/WebCore/GNUmakefile.am

    r40393 r40412  
    368368        WebCore/bindings/js/ScriptValue.h \
    369369        WebCore/bindings/js/StringSourceProvider.h \
     370        WebCore/bridge/IdentifierRep.cpp \
     371        WebCore/bridge/IdentifierRep.h \
    370372        WebCore/bridge/NP_jsobject.cpp \
    371373        WebCore/bridge/NP_jsobject.h \

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r40393 r40412  
    1637516375                        </File>
    1637616376                        <File
     16377                                RelativePath="..\bridge\IdentifierRep.cpp"
     16378                                >
     16379                        </File>
     16380                        <File
     16381                                RelativePath="..\bridge\IdentifierRep.h"
     16382                                >
     16383                        </File>
     16384                        <File
    1637716385                                RelativePath="..\bridge\npruntime_impl.h"
    1637816386                                >

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r40395 r40412  
    277277                1A6938010A11100A00C127FE /* TextDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6937FF0A11100A00C127FE /* TextDocument.cpp */; };
    278278                1A6938020A11100A00C127FE /* TextDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6938000A11100A00C127FE /* TextDocument.h */; };
     279                1A71D57B0F33819000F9CE4E /* IdentifierRep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A71D5790F33819000F9CE4E /* IdentifierRep.cpp */; };
     280                1A71D57C0F33819000F9CE4E /* IdentifierRep.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A71D57A0F33819000F9CE4E /* IdentifierRep.h */; };
    279281                1A750D5C0A90DEE1000FF215 /* JSTreeWalker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A750D5A0A90DEE1000FF215 /* JSTreeWalker.cpp */; };
    280282                1A750D5D0A90DEE1000FF215 /* JSTreeWalker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A750D5B0A90DEE1000FF215 /* JSTreeWalker.h */; };
    … …  
    51405142                1A6937FF0A11100A00C127FE /* TextDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextDocument.cpp; sourceTree = "<group>"; };
    51415143                1A6938000A11100A00C127FE /* TextDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextDocument.h; sourceTree = "<group>"; };
     5144                1A71D5790F33819000F9CE4E /* IdentifierRep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IdentifierRep.cpp; path = bridge/IdentifierRep.cpp; sourceTree = "<group>"; };
     5145                1A71D57A0F33819000F9CE4E /* IdentifierRep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IdentifierRep.h; path = bridge/IdentifierRep.h; sourceTree = "<group>"; };
    51425146                1A750D3C0A90DE35000FF215 /* TreeWalker.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TreeWalker.idl; sourceTree = "<group>"; };
    51435147                1A750D5A0A90DEE1000FF215 /* JSTreeWalker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSTreeWalker.cpp; sourceTree = "<group>"; };
    … …  
    94239427                                1A569CCE0D7E2B82007C3983 /* jni */,
    94249428                                1A569CE20D7E2B82007C3983 /* objc */,
     9429                                1A71D5790F33819000F9CE4E /* IdentifierRep.cpp */,
     9430                                1A71D57A0F33819000F9CE4E /* IdentifierRep.h */,
    94259431                                1A569CDA0D7E2B82007C3983 /* NP_jsobject.cpp */,
    94269432                                1A569CDB0D7E2B82007C3983 /* NP_jsobject.h */,
    … …  
    1666416670                                BC2CC8DF0F32881000A9DF26 /* RenderObjectChildList.h in Headers */,
    1666516671                                185BCF290F3279CE000EA262 /* ThreadTimers.h in Headers */,
     16672                                1A71D57C0F33819000F9CE4E /* IdentifierRep.h in Headers */,
    1666616673                        );
    1666716674                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1863818645                                93309E1D099E64920056E581 /* visible_units.cpp in Sources */,
    1863918646                                185BCF280F3279CE000EA262 /* ThreadTimers.cpp in Sources */,
     18647                                1A71D57B0F33819000F9CE4E /* IdentifierRep.cpp in Sources */,
    1864018648                        );
    1864118649                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/bridge/c/c_utility.h

    r39670 r40412  
    4747typedef uint16_t NPUTF16;
    4848
    49 enum NP_ValueType {
    50     NP_NumberValueType,
    51     NP_StringValueType,
    52     NP_BooleanValueType,
    53     NP_NullValueType,
    54     NP_UndefinedValueType,
    55     NP_ObjectValueType,
    56     NP_InvalidValueType
    57 };
    58 
    5949WebCore::String convertNPStringToUTF16(const NPString *string);
    6050void convertValueToNPVariant(ExecState*, JSValuePtr, NPVariant* result);

  • trunk/WebCore/platform/text/PlatformString.h

    r40059 r40412  
    229229    static String fromUTF8(const char*);
    230230
     231    // Tries to convert the passed in string to UTF-8, but will fall back to Latin-1 if the string is not valid UTF-8.
     232    static String fromUTF8WithLatin1Fallback(const char*, size_t);
     233   
    231234    // Determines the writing direction using the Unicode Bidi Algorithm rules P2 and P3.
    232235    WTF::Unicode::Direction defaultWritingDirection() const { return m_impl ? m_impl->defaultWritingDirection() : WTF::Unicode::LeftToRight; }

  • trunk/WebCore/platform/text/String.cpp

    r40175 r40412  
    624624}
    625625
     626String String::fromUTF8WithLatin1Fallback(const char* string, size_t size)
     627{
     628    String result = fromUTF8(string, size);
     629    if (!result)
     630        result = String(string, size);
     631   
     632    return result;
     633}
     634
    626635#if USE(JSC)
    627636String::String(const Identifier& str)
Note: See TracChangeset for help on using the changeset viewer.