Attachment 341430 Details for Bug 185979 – Patch

[patch] Patch

bug-185979-20180528000402.patch (text/plain), 5.37 KB, created by Tadeu Zagallo on 2018-05-27 15:04:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tadeu Zagallo

Created: 2018-05-27 15:04:04 PDT

Size: 5.37 KB

patch

obsolete

>Subversion Revision: 231953
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a1436ce64f3c27850ca0e5ad58db34c4dd623446..2a1bf8d97defe2d1b0e20ad6f69dead04bc9cdff 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-05-27  Tadeu Zagallo  <tzagallo@apple.com>
>+
>+        Don't assert on m_actionsStart when setting actions on DFA nodes
>+        https://bugs.webkit.org/show_bug.cgi?id=185979
>+        <rdar://problem/39669458>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        DFANode::setActions is called immediately after the node is created, and once again to set
>+        the actions of catch-all regular expressions (.*) on the root node. That works because
>+        m_actionsStart is initially 0, since the root was the first node to be created, but may fail
>+        after minimizing the DFA, when the root may no longer be the first node, and therefore
>+        m_actionsStart would not be 0, even if there are no actions attached to that node.
>+
>+        Test: http/tests/contentextensions/root-actions.html
>+
>+        * contentextensions/DFANode.h:
>+
> 2018-05-18  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Implement height computation for replaced elements.
>diff --git a/Source/WebCore/contentextensions/DFANode.h b/Source/WebCore/contentextensions/DFANode.h
>index 342ef916719af2fbbc04e22d7d5407753a532b00..3fbc8480bf667c5a056dc267e250c8e6b17ace9a 100644
>--- a/Source/WebCore/contentextensions/DFANode.h
>+++ b/Source/WebCore/contentextensions/DFANode.h
>@@ -145,7 +145,6 @@ public:
> 
>     void setActions(uint32_t start, uint16_t length)
>     {
>-        ASSERT(!m_actionsStart);
>         ASSERT(!m_actionsLength);
>         m_actionsStart = start;
>         m_actionsLength = length;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 6de6affcac6693a935b5c90e4fb885b0d425f500..4559a450f47e62db99768f22d5adb0e0dc051ca5 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-05-27  Tadeu Zagallo  <tzagallo@apple.com>
>+
>+        Don't assert on m_actionsStart when setting actions on DFA nodes
>+        https://bugs.webkit.org/show_bug.cgi?id=185979
>+        <rdar://problem/39669458>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        DFANode::setActions is called immediately after the node is created, and once again to set
>+        the actions of catch-all regular expressions (.*) on the root node. That works because
>+        m_actionsStart is initially 0, since the root was the first node to be created, but may fail
>+        after minimizing the DFA, when the root may no longer be the first node, and therefore
>+        m_actionsStart would not be 0, even if there are no actions attached to that node.
>+
>+        * http/tests/contentextensions/root-actions-expected.txt: Added.
>+        * http/tests/contentextensions/root-actions.html: Added.
>+        * http/tests/contentextensions/root-actions.html.json: Added.
>+
> 2018-05-18  Per Arne Vollan  <pvollan@apple.com>
> 
>         The test fast/images/animated-image-mp4-crash.html is failing on Windows.
>diff --git a/LayoutTests/http/tests/contentextensions/root-actions-expected.txt b/LayoutTests/http/tests/contentextensions/root-actions-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..c58bc06164c77f981f76872ac49afb9138ac77c8
>--- /dev/null
>+++ b/LayoutTests/http/tests/contentextensions/root-actions-expected.txt
>@@ -0,0 +1,6 @@
>+CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/root-actions.html from loading a resource from http://127.0.0.1:8000/contentextensions/root-actions.html
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x584
>diff --git a/LayoutTests/http/tests/contentextensions/root-actions.html b/LayoutTests/http/tests/contentextensions/root-actions.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..e4e088c74a58dee918d482a9653f1d5b72a5d25f
>--- /dev/null
>+++ b/LayoutTests/http/tests/contentextensions/root-actions.html
>@@ -0,0 +1,4 @@
>+<body>
>+<p>Test that root actions combined DFA minimizing don't crash in Debug</p>
>+<p>See https://bugs.webkit.org/show_bug.cgi?id=185979</p>
>+</body>
>diff --git a/LayoutTests/http/tests/contentextensions/root-actions.html.json b/LayoutTests/http/tests/contentextensions/root-actions.html.json
>new file mode 100644
>index 0000000000000000000000000000000000000000..27e6baa20782ab92d8875db4444891b4acc5e6cb
>--- /dev/null
>+++ b/LayoutTests/http/tests/contentextensions/root-actions.html.json
>@@ -0,0 +1,38 @@
>+[
>+    {
>+        "action": {
>+            "type": "block"
>+        },
>+        "trigger": {
>+            "url-filter": "www\\.example\\.com/cookie\\.js",
>+            "url-filter-is-case-sensitive": true
>+        }
>+    },
>+    {
>+        "action": {
>+            "type": "block"
>+        },
>+        "trigger": {
>+            "url-filter": "\\.morecookies",
>+            "url-filter-is-case-sensitive": true
>+        }
>+    },
>+    {
>+        "action": {
>+            "type": "block"
>+        },
>+        "trigger": {
>+            "url-filter": "/cookie\\.js",
>+            "url-filter-is-case-sensitive": true
>+        }
>+    },
>+    {
>+        "action": {
>+            "type": "block"
>+        },
>+        "trigger": {
>+            "url-filter": ".*",
>+            "url-filter-is-case-sensitive": true
>+        }
>+    }
>+]

Actions: View | Formatted Diff | Diff

Attachments on bug 185979: 341430 | 341449