Changeset 71930 in webkit

Timestamp:

Nov 12, 2010 10:39:53 AM (13 years ago)

Author:

weinig@apple.com

Message:

ASSERTION when converting some WKStringRefs returned from willSubmitForm to CFStringRef
<rdar://problem/8662180>
​https://bugs.webkit.org/show_bug.cgi?id=49454

Reviewed by Anders Carlsson.

Enforce the invariant that a WebString never contains a null WTF::String at a
lower level, in the WebString constructor, instead of relying on the callers of
WebString::create to do it.

• Shared/API/c/WKSharedAPICast.h:

(WebKit::toAPI):
(WebKit::toCopiedAPI): Remove null string check...

• Shared/WebString.h:

(WebKit::WebString::WebString): ... and move it to the constructor.

• Shared/API/c/WKURL.cpp:

(WKURLCopyString): Use toCopiedAPI() instead of calling WebString directly
to match other similar uses.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/c/WKSharedAPICast.h (modified) (1 diff)
• Shared/API/c/WKURL.cpp (modified) (1 diff)
• Shared/WebString.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-11-12  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        ASSERTION when converting some WKStringRefs returned from willSubmitForm to CFStringRef
+        <rdar://problem/8662180>
+        https://bugs.webkit.org/show_bug.cgi?id=49454
+
+        Enforce the invariant that a WebString never contains a null WTF::String at a
+        lower level, in the WebString constructor, instead of relying on the callers of
+        WebString::create to do it.
+
+        * Shared/API/c/WKSharedAPICast.h:
+        (WebKit::toAPI):
+        (WebKit::toCopiedAPI): Remove null string check...
+
+        * Shared/WebString.h:
+        (WebKit::WebString::WebString): ... and move it to the constructor.
+
+        * Shared/API/c/WKURL.cpp:
+        (WKURLCopyString): Use toCopiedAPI() instead of calling WebString directly
+        to match other similar uses.
+
 2010-11-12  Andreas Kling  <kling@webkit.org>
 

trunk/WebKit2/Shared/API/c/WKSharedAPICast.h

@@ -116 +116 @@
 inline ProxyingRefPtr<WebString> toAPI(StringImpl* string)
 {
-    StringImpl* impl = string ? string : StringImpl::empty();
-    return ProxyingRefPtr<WebString>(WebString::create(String(impl)));
+    return ProxyingRefPtr<WebString>(WebString::create(string));
 }
 
 inline WKStringRef toCopiedAPI(const String& string)
 {
-    StringImpl* impl = string.impl() ? string.impl() : StringImpl::empty();
-    RefPtr<WebString> webString = WebString::create(String(impl));
+    RefPtr<WebString> webString = WebString::create(string);
     return toAPI(webString.release().releaseRef());
 }

trunk/WebKit2/Shared/API/c/WKURL.cpp

@@ -42 +42 @@
 WKStringRef WKURLCopyString(WKURLRef url)
 {
-    return toAPI(WebString::create(toImpl(url)->string()).leakRef());
+    return toCopiedAPI(toImpl(url)->string());
 }
 

trunk/WebKit2/Shared/WebString.h

@@ -82 +82 @@
 private:
     WebString(const String& string)
-        : m_string(string)
+        : m_string(!string.impl() ? String(StringImpl::empty()) : string)
     {
     }