Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 10 insertions, 0 deletions

diff --git a/Source/WebKit2/Shared/WebString.h b/Source/WebKit2/Shared/WebString.h
index 6827276..5935b4a 100644
--- a/Source/WebKit2/Shared/WebString.h
+++ b/Source/WebKit2/Shared/WebString.h
@@ -57,6 +57,16 @@ public:
 
     bool isNull() const { return m_string.isNull(); }
     bool isEmpty() const { return m_string.isEmpty(); }
+    
+    size_t length() const { return m_string.length(); }
+    size_t getCharacters(UChar* buffer, size_t bufferLength) const
+    {
+        if (!bufferLength)
+            return 0;
+        bufferLength = std::min(bufferLength, static_cast<size_t>(m_string.length()));
+        memcpy(buffer, m_string.characters(), bufferLength * sizeof(UChar));
+        return bufferLength;
+    }
 
     size_t maximumUTF8CStringSize() const { return m_string.length() * 3 + 1; }
     size_t getUTF8CString(char* buffer, size_t bufferSize)