Changeset 83110 in webkit

Timestamp:

Apr 6, 2011 3:24:32 PM (13 years ago)

Author:

jeffm@apple.com

Message:

2011-04-06 Jeff Miller <​jeffm@apple.com>

Reviewed by Adam Roben.

Add WKStringGetCharactersPtr() and WKStringGetLength() to WebKit2 C API
​https://bugs.webkit.org/show_bug.cgi?id=57989

Note that WKChar, which is returned by WKStringGetCharactersPtr(), is defined the same way we define JSChar in JSStringRef.h.

• Shared/API/c/WKString.cpp: (WKStringGetLength): Added. (WKStringGetCharactersPtr): Added.
• Shared/API/c/WKString.h: Define WKChar and added WKStringGetLength() and WKStringGetCharactersPtr().
• Shared/WebString.h: (WebKit::WebString::length): Added. (WebKit::WebString::characters): Added.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/c/WKString.cpp (modified) (1 diff)
• Shared/API/c/WKString.h (modified) (2 diffs)
• Shared/WebString.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-06  Jeff Miller  <jeffm@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Add WKStringGetCharactersPtr() and WKStringGetLength() to WebKit2 C API
+        https://bugs.webkit.org/show_bug.cgi?id=57989
+        
+        Note that WKChar, which is returned by WKStringGetCharactersPtr(), is defined the same way we define JSChar in JSStringRef.h.
+
+        * Shared/API/c/WKString.cpp:
+        (WKStringGetLength): Added.
+        (WKStringGetCharactersPtr): Added.
+        * Shared/API/c/WKString.h: Define WKChar and added WKStringGetLength() and WKStringGetCharactersPtr().
+        * Shared/WebString.h:
+        (WebKit::WebString::length): Added.
+        (WebKit::WebString::characters): Added.
+
 2011-04-06  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/API/c/WKString.cpp

@@ -48 +48 @@
 }
 
+size_t WKStringGetLength(WKStringRef stringRef)
+{
+    return toImpl(stringRef)->length();
+}
+
+const WKChar* WKStringGetCharactersPtr(WKStringRef stringRef)
+{
+    COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharactersPtr_sizeof_WKChar_matches_UChar);
+    return reinterpret_cast<const WKChar*>(toImpl(stringRef)->characters());
+}
+
 size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
 {

trunk/Source/WebKit2/Shared/API/c/WKString.h

@@ -37 +37 @@
 #endif
 
+#if !defined(WIN32) && !defined(_WIN32) && !defined(__WINSCW__) \
+    && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
+    typedef unsigned short WKChar;
+#else
+    typedef wchar_t WKChar;
+#endif
+
 WK_EXPORT WKTypeID WKStringGetTypeID();
 
@@ -42 +49 @@
 
 WK_EXPORT bool WKStringIsEmpty(WKStringRef string);
+
+WK_EXPORT size_t WKStringGetLength(WKStringRef string);
+WK_EXPORT const WKChar* WKStringGetCharactersPtr(WKStringRef string);
 
 WK_EXPORT size_t WKStringGetMaximumUTF8CStringSize(WKStringRef string);

trunk/Source/WebKit2/Shared/WebString.h

@@ -58 +58 @@
     bool isNull() const { return m_string.isNull(); }
     bool isEmpty() const { return m_string.isEmpty(); }
+    
+    size_t length() const { return m_string.length(); }
+    const UChar* characters() const { return m_string.characters(); }
 
     size_t maximumUTF8CStringSize() const { return m_string.length() * 3 + 1; }