Title: [184684] trunk/Source/WebCore
Revision
184684
Author
achristen...@apple.com
Date
2015-05-20 18:15:43 -0700 (Wed, 20 May 2015)

Log Message

[ContentExtensions] Properly initialize ActionKey.state
https://bugs.webkit.org/show_bug.cgi?id=145237
rdar://problem/20716683

Reviewed by Benjamin Poulain.

* contentextensions/DFAMinimizer.cpp:
Initialize ActionKey.state to Valid if it is a valid ActionKey.
Inlining can now be done safely.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (184683 => 184684)


--- trunk/Source/WebCore/ChangeLog	2015-05-21 01:14:16 UTC (rev 184683)
+++ trunk/Source/WebCore/ChangeLog	2015-05-21 01:15:43 UTC (rev 184684)
@@ -1,3 +1,15 @@
+2015-05-20  Alex Christensen  <achristen...@webkit.org>
+
+        [ContentExtensions] Properly initialize ActionKey.state
+        https://bugs.webkit.org/show_bug.cgi?id=145237
+        rdar://problem/20716683
+
+        Reviewed by Benjamin Poulain.
+
+        * contentextensions/DFAMinimizer.cpp:
+        Initialize ActionKey.state to Valid if it is a valid ActionKey.
+        Inlining can now be done safely.
+
 2015-05-20  Roger Fong  <roger_f...@apple.com>
 
         Unreviewed. Media Controls stop updating after hovering for a few seconds.

Modified: trunk/Source/WebCore/contentextensions/DFAMinimizer.cpp (184683 => 184684)


--- trunk/Source/WebCore/contentextensions/DFAMinimizer.cpp	2015-05-21 01:14:16 UTC (rev 184683)
+++ trunk/Source/WebCore/contentextensions/DFAMinimizer.cpp	2015-05-21 01:15:43 UTC (rev 184684)
@@ -437,6 +437,7 @@
         : dfa(dfa)
         , actionsStart(actionsStart)
         , actionsLength(actionsLength)
+        , state(Valid)
     {
         StringHasher hasher;
         hasher.addCharactersAssumingAligned(reinterpret_cast<const UChar*>(&dfa->actions[actionsStart]), actionsLength * sizeof(uint64_t) / sizeof(UChar));
@@ -465,8 +466,7 @@
         return actionKey.hash;
     }
 
-    // FIXME: Release builds on Mavericks fail with this inlined.
-    __attribute__((noinline)) static bool equal(const ActionKey& a, const ActionKey& b)
+    static bool equal(const ActionKey& a, const ActionKey& b)
     {
         if (a.state != b.state
             || a.dfa != b.dfa
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to