Attachment 347193 Details for Bug 188611 – Patch

[patch] Patch

bug-188611-20180815123444.patch (text/plain), 4.02 KB, created by Alex Christensen on 2018-08-15 12:34:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-15 12:34:44 PDT

Size: 4.02 KB

patch

obsolete

>Index: Source/WTF/ChangeLog
>===================================================================
>--- Source/WTF/ChangeLog	(revision 234881)
>+++ Source/WTF/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2018-08-15  Alex Christensen  <achristensen@webkit.org>
>+
>+        Re-introduce assertion removed in r234890
>+        https://bugs.webkit.org/show_bug.cgi?id=188611
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/text/WTFString.h:
>+
> 2018-08-14  Saam barati  <sbarati@apple.com>
> 
>         HashMap<Ref<P>, V> asserts when V is not zero for its empty value
>Index: Source/WTF/wtf/text/WTFString.h
>===================================================================
>--- Source/WTF/wtf/text/WTFString.h	(revision 234881)
>+++ Source/WTF/wtf/text/WTFString.h	(working copy)
>@@ -427,7 +427,10 @@ WTF_EXPORT_PRIVATE const String& emptySt
> 
> template<typename> struct DefaultHash;
> template<> struct DefaultHash<String> { using Hash = StringHash; };
>-template<> struct VectorTraits<String> : SimpleClassVectorTraits { };
>+template<> struct VectorTraits<String> : VectorTraitsBase<false, void> {
>+    static const bool canInitializeWithMemset = true;
>+    static const bool canMoveWithMemcpy = true;
>+};
> 
> template<> struct IntegerToStringConversionTrait<String> {
>     using ReturnType = String;
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 234890)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2018-08-15  Alex Christensen  <achristensen@webkit.org>
>+
>+        Re-introduce assertion removed in r234890
>+        https://bugs.webkit.org/show_bug.cgi?id=188611
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The assertion was failing because Vector<String>::operator== was using memcmp,
>+        which failed to consider different instances of equal Strings equal.  Added an
>+        API test and this assertion, which now succeeds.
>+
>+        * contentextensions/ContentExtensionCompiler.cpp:
>+        (WebCore::ContentExtensions::compileRuleList):
>+
> 2018-08-15  Alex Christensen  <achristensen@webkit.org>
> 
>         Remove failing assertion introduced in r234873
>Index: Source/WebCore/contentextensions/ContentExtensionCompiler.cpp
>===================================================================
>--- Source/WebCore/contentextensions/ContentExtensionCompiler.cpp	(revision 234890)
>+++ Source/WebCore/contentextensions/ContentExtensionCompiler.cpp	(working copy)
>@@ -285,6 +285,12 @@ static void compileToBytecode(CombinedUR
> 
> std::error_code compileRuleList(ContentExtensionCompilationClient& client, String&& ruleJSON, Vector<ContentExtensionRule>&& parsedRuleList)
> {
>+#if !ASSERT_DISABLED
>+    callOnMainThread([ruleJSON = ruleJSON.isolatedCopy(), parsedRuleList = parsedRuleList.isolatedCopy()] {
>+        ASSERT(parseRuleList(ruleJSON) == parsedRuleList);
>+    });
>+#endif
>+
>     bool domainConditionSeen = false;
>     bool topURLConditionSeen = false;
>     for (const auto& rule : parsedRuleList) {
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 234893)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-08-15  Alex Christensen  <achristensen@webkit.org>
>+
>+        Re-introduce assertion removed in r234890
>+        https://bugs.webkit.org/show_bug.cgi?id=188611
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WTF/Vector.cpp:
>+        (TestWebKitAPI::TEST):
>+
> 2018-08-15  Jonathan Bedard  <jbedard@apple.com>
> 
>         WebKitTestRunner should support watch devices
>Index: Tools/TestWebKitAPI/Tests/WTF/Vector.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WTF/Vector.cpp	(revision 234881)
>+++ Tools/TestWebKitAPI/Tests/WTF/Vector.cpp	(working copy)
>@@ -888,4 +888,11 @@ TEST(WTF_Vector, CopyToVectorSizeRangeIt
>     EXPECT_FLOAT_EQ(9, valuesVector[2]);
> }
> 
>+TEST(WTF_Vector, StringComparison)
>+{
>+    Vector<String> a = {{ "a" }};
>+    Vector<String> b = {{ "a" }};
>+    EXPECT_TRUE(a == b);
>+}
>+    
> } // namespace TestWebKitAPI

Actions: View | Formatted Diff | Diff

Attachments on bug 188611: 347193