<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[180449] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/180449">180449</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 13:09:06 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>API::String should just be a simple wrapper for WTF strings
https://bugs.webkit.org/show_bug.cgi?id=141852
Reviewed by Beth Dakin.
Expose a StringView member function on API::String. Move all the WKString API implementations to WKString.cpp.
* Shared/API/APIString.h:
* Shared/API/c/WKString.cpp:
(WKStringIsEmpty):
(WKStringGetLength):
(WKStringGetCharacters):
(WKStringGetMaximumUTF8CStringSize):
(WKStringGetUTF8CString):
(WKStringIsEqual):
(WKStringIsEqualToUTF8CString):
(WKStringIsEqualToUTF8CStringIgnoringCase):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIStringh">trunk/Source/WebKit2/Shared/API/APIString.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKStringcpp">trunk/Source/WebKit2/Shared/API/c/WKString.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180448 => 180449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-20 20:54:57 UTC (rev 180448)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-20 21:09:06 UTC (rev 180449)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-02-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ API::String should just be a simple wrapper for WTF strings
+ https://bugs.webkit.org/show_bug.cgi?id=141852
+
+ Reviewed by Beth Dakin.
+
+ Expose a StringView member function on API::String. Move all the WKString API implementations to WKString.cpp.
+
+ * Shared/API/APIString.h:
+ * Shared/API/c/WKString.cpp:
+ (WKStringIsEmpty):
+ (WKStringGetLength):
+ (WKStringGetCharacters):
+ (WKStringGetMaximumUTF8CStringSize):
+ (WKStringGetUTF8CString):
+ (WKStringIsEqual):
+ (WKStringIsEqualToUTF8CString):
+ (WKStringIsEqualToUTF8CStringIgnoringCase):
+
+2015-02-20 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> API::String::string() needs to return an isolated string copy
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141846
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIString.h (180448 => 180449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIString.h 2015-02-20 20:54:57 UTC (rev 180448)
+++ trunk/Source/WebKit2/Shared/API/APIString.h 2015-02-20 21:09:06 UTC (rev 180449)
</span><span class="lines">@@ -55,42 +55,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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
- {
- unsigned unsignedBufferLength = std::min<size_t>(bufferLength, std::numeric_limits<unsigned>::max());
- StringView substring = StringView(m_string).substring(0, unsignedBufferLength);
- substring.getCharactersWithUpconvert(buffer);
- return substring.length();
- }
-
- size_t maximumUTF8CStringSize() const { return m_string.length() * 3 + 1; }
- size_t getUTF8CString(char* buffer, size_t bufferSize)
- {
- if (!bufferSize)
- return 0;
- char* p = buffer;
- WTF::Unicode::ConversionResult result;
- if (m_string.is8Bit()) {
- const LChar* characters = m_string.characters8();
- result = WTF::Unicode::convertLatin1ToUTF8(&characters, characters + m_string.length(), &p, p + bufferSize - 1);
- } else {
- const UChar* characters = m_string.characters16();
- result = WTF::Unicode::convertUTF16ToUTF8(&characters, characters + m_string.length(), &p, p + bufferSize - 1, /* strict */ true);
- }
- if (result != WTF::Unicode::conversionOK && result != WTF::Unicode::targetExhausted)
- return 0;
- *p++ = '\0';
- return p - buffer;
- }
-
- bool equal(String* other) { return m_string == other->m_string; }
- bool equalToUTF8String(const char* other) { return m_string == WTF::String::fromUTF8(other); }
- bool equalToUTF8StringIgnoringCase(const char* other) { return equalIgnoringCase(m_string, other); }
-
</del><ins>+ WTF::StringView stringView() const { return m_string; }
</ins><span class="cx"> WTF::String string() const { return m_string.isolatedCopy(); }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKString.cpp (180448 => 180449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKString.cpp 2015-02-20 20:54:57 UTC (rev 180448)
+++ trunk/Source/WebKit2/Shared/API/c/WKString.cpp 2015-02-20 21:09:06 UTC (rev 180449)
</span><span class="lines">@@ -47,43 +47,69 @@
</span><span class="cx">
</span><span class="cx"> bool WKStringIsEmpty(WKStringRef stringRef)
</span><span class="cx"> {
</span><del>- return toImpl(stringRef)->isEmpty();
</del><ins>+ return toImpl(stringRef)->stringView().isEmpty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t WKStringGetLength(WKStringRef stringRef)
</span><span class="cx"> {
</span><del>- return toImpl(stringRef)->length();
</del><ins>+ return toImpl(stringRef)->stringView().length();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
</span><span class="cx"> {
</span><del>- COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
</del><ins>+ static_assert(sizeof(WKChar) == sizeof(UChar), "Size of WKChar must match size of UChar");
+
+ unsigned unsignedBufferLength = std::min<size_t>(bufferLength, std::numeric_limits<unsigned>::max());
+ auto substring = toImpl(stringRef)->stringView().substring(0, unsignedBufferLength);
+
+ substring.getCharactersWithUpconvert(static_cast<UChar*>(buffer));
+ return substring.length();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
</span><span class="cx"> {
</span><del>- return toImpl(stringRef)->maximumUTF8CStringSize();
</del><ins>+ return toImpl(stringRef)->stringView().length() * 3 + 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t WKStringGetUTF8CString(WKStringRef stringRef, char* buffer, size_t bufferSize)
</span><span class="cx"> {
</span><del>- return toImpl(stringRef)->getUTF8CString(buffer, bufferSize);
</del><ins>+ if (!bufferSize)
+ return 0;
+
+ auto stringView = toImpl(stringRef)->stringView();
+
+ char* p = buffer;
+ WTF::Unicode::ConversionResult result;
+
+ if (stringView.is8Bit()) {
+ const LChar* characters = stringView.characters8();
+ result = WTF::Unicode::convertLatin1ToUTF8(&characters, characters + stringView.length(), &p, p + bufferSize - 1);
+ } else {
+ const UChar* characters = stringView.characters16();
+ result = WTF::Unicode::convertUTF16ToUTF8(&characters, characters + stringView.length(), &p, p + bufferSize - 1, /* strict */ true);
+ }
+
+ if (result != WTF::Unicode::conversionOK && result != WTF::Unicode::targetExhausted)
+ return 0;
+
+ *p++ = '\0';
+ return p - buffer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WKStringIsEqual(WKStringRef aRef, WKStringRef bRef)
</span><span class="cx"> {
</span><del>- return toImpl(aRef)->equal(toImpl(bRef));
</del><ins>+ return toImpl(aRef)->stringView() == toImpl(bRef)->stringView();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WKStringIsEqualToUTF8CString(WKStringRef aRef, const char* b)
</span><span class="cx"> {
</span><del>- return toImpl(aRef)->equalToUTF8String(b);
</del><ins>+ return toImpl(aRef)->stringView() == WTF::String::fromUTF8(b);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WKStringIsEqualToUTF8CStringIgnoringCase(WKStringRef aRef, const char* b)
</span><span class="cx"> {
</span><del>- return toImpl(aRef)->equalToUTF8StringIgnoringCase(b);
</del><ins>+ // FIXME: Instead of copying the string here, we should add a version of equalIgnoringCase that takes StringViews.
+ return equalIgnoringCase(toImpl(aRef)->string(), WTF::String::fromUTF8(b));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKStringCreateWithJSString(JSStringRef jsStringRef)
</span></span></pre>
</div>
</div>
</body>
</html>