Changeset 181065 in webkit

Timestamp:

Mar 4, 2015 8:54:08 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Optimize content extensions.
​https://bugs.webkit.org/show_bug.cgi?id=142295

Patch by Alex Christensen <​achristensen@webkit.org> on 2015-03-04
Reviewed by Benjamin Poulain.

• contentextensions/ContentExtensionCompiler.cpp:

(WebCore::ContentExtensions::serializeActions):
There is no need to add duplicate sequential actions.

• contentextensions/ContentExtensionRule.h:

(WebCore::ContentExtensions::Action::operator==):
Added to compare actions.

• contentextensions/ContentExtensionsBackend.cpp:

(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForURL):
Return early if a block action is found instead of moving to the next extension.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• contentextensions/ContentExtensionCompiler.cpp (modified) (1 diff)
• contentextensions/ContentExtensionRule.h (modified) (1 diff)
• contentextensions/ContentExtensionsBackend.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-04  Alex Christensen  <achristensen@webkit.org>
+
+        Optimize content extensions.
+        https://bugs.webkit.org/show_bug.cgi?id=142295
+
+        Reviewed by Benjamin Poulain.
+
+        * contentextensions/ContentExtensionCompiler.cpp:
+        (WebCore::ContentExtensions::serializeActions):
+        There is no need to add duplicate sequential actions.
+        * contentextensions/ContentExtensionRule.h:
+        (WebCore::ContentExtensions::Action::operator==):
+        Added to compare actions.
+        * contentextensions/ContentExtensionsBackend.cpp:
+        (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForURL):
+        Return early if a block action is found instead of moving to the next extension.
+
 2015-03-04  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp

@@ -53 +53 @@
     for (unsigned ruleIndex = 0; ruleIndex < ruleList.size(); ++ruleIndex) {
         const ContentExtensionRule& rule = ruleList[ruleIndex];
+        
+        // Identical sequential actions should not be rewritten.
+        if (ruleIndex && rule.action() == ruleList[ruleIndex - 1].action()) {
+            actionLocations.append(actionLocations[ruleIndex - 1]);
+            continue;
+        }
         actionLocations.append(actions.size());
         

trunk/Source/WebCore/contentextensions/ContentExtensionRule.h

@@ -62 +62 @@
         ASSERT(type != ActionType::CSSDisplayNone);
     }
+    bool operator==(const Action& other) const
+    {
+        return m_type == other.m_type
+            && m_cssSelector == other.m_cssSelector;
+    }
     static Action deserialize(const Vector<SerializedActionByte>&, unsigned location);
 

trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp

@@ -87 +87 @@
                 actions.append(action);
                 if (action.type() == ActionType::BlockLoad)
-                    break;
+                    return actions;
             }
         }