Changeset 276154 in webkit

Timestamp:

Apr 16, 2021, 12:22:56 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Reduce maximum HashTable entry size to 128 bytes
​https://bugs.webkit.org/show_bug.cgi?id=224381

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-04-16
Reviewed by Yusuke Suzuki.

Source/WebCore:

• inspector/agents/InspectorAnimationAgent.cpp:

(WebCore::InspectorAnimationAgent::willApplyKeyframeEffect):
(WebCore::InspectorAnimationAgent::stopTrackingDeclarativeAnimation):

• inspector/agents/InspectorAnimationAgent.h:

Source/WTF:

• wtf/HashTable.h:

(WTF::KeyTraits>::inlineLookup):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/HashTable.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/agents/InspectorAnimationAgent.cpp (modified) (2 diffs)
• WebCore/inspector/agents/InspectorAnimationAgent.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-04-16  Alex Christensen  <achristensen@webkit.org>
+
+        Reduce maximum HashTable entry size to 128 bytes
+        https://bugs.webkit.org/show_bug.cgi?id=224381
+
+        Reviewed by Yusuke Suzuki.
+
+        * wtf/HashTable.h:
+        (WTF::KeyTraits>::inlineLookup):
+
 2021-04-16  Tyler Wilcock  <twilco.o@protonmail.com>
 

trunk/Source/WTF/wtf/HashTable.h

@@ -666 +666 @@
     ALWAYS_INLINE auto HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::inlineLookup(const T& key) -> ValueType*
     {
-        static_assert(sizeof(Value) <= 250, "Your HashTable types are too big to efficiently move when rehashing.  Consider using UniqueRef instead");
+        static_assert(sizeof(Value) <= 128, "Your HashTable types are too big to efficiently move when rehashing.  Consider using UniqueRef instead");
         checkKey<HashTranslator>(key);
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-16  Alex Christensen  <achristensen@webkit.org>
+
+        Reduce maximum HashTable entry size to 128 bytes
+        https://bugs.webkit.org/show_bug.cgi?id=224381
+
+        Reviewed by Yusuke Suzuki.
+
+        * inspector/agents/InspectorAnimationAgent.cpp:
+        (WebCore::InspectorAnimationAgent::willApplyKeyframeEffect):
+        (WebCore::InspectorAnimationAgent::stopTrackingDeclarativeAnimation):
+        * inspector/agents/InspectorAnimationAgent.h:
+
 2021-04-16  Tyler Wilcock  <twilco.o@protonmail.com>
 

trunk/Source/WebCore/inspector/agents/InspectorAnimationAgent.cpp

@@ -379 +379 @@
         return;
 
-    auto ensureResult = m_trackedDeclarativeAnimationData.ensure(downcast<DeclarativeAnimation>(animation), [&] () -> TrackedDeclarativeAnimationData {
-        return { makeString("animation:"_s, IdentifiersFactory::createIdentifier()), computedTiming };
+    auto ensureResult = m_trackedDeclarativeAnimationData.ensure(downcast<DeclarativeAnimation>(animation), [&] () -> UniqueRef<TrackedDeclarativeAnimationData> {
+        return makeUniqueRef<TrackedDeclarativeAnimationData>(TrackedDeclarativeAnimationData { makeString("animation:"_s, IdentifiersFactory::createIdentifier()), computedTiming });
     });
-    auto& trackingData = ensureResult.iterator->value;
+    auto& trackingData = ensureResult.iterator->value.get();
 
     Optional<Protocol::Animation::AnimationState> animationAnimationState;
@@ -601 +601 @@
 void InspectorAnimationAgent::stopTrackingDeclarativeAnimation(DeclarativeAnimation& animation)
 {
-    auto it = m_trackedDeclarativeAnimationData.find(&animation);
-    if (it == m_trackedDeclarativeAnimationData.end())
-        return;
-
-    if (it->value.lastComputedTiming.phase != AnimationEffectPhase::After && it->value.lastComputedTiming.phase != AnimationEffectPhase::Idle) {
+    auto data = m_trackedDeclarativeAnimationData.take(&animation);
+    if (!data)
+        return;
+
+    if (data->lastComputedTiming.phase != AnimationEffectPhase::After && data->lastComputedTiming.phase != AnimationEffectPhase::Idle) {
         auto event = Protocol::Animation::TrackingUpdate::create()
-            .setTrackingAnimationId(it->value.trackingAnimationId)
+            .setTrackingAnimationId(data->trackingAnimationId)
             .setAnimationState(Protocol::Animation::AnimationState::Canceled)
             .release();
         m_frontendDispatcher->trackingUpdate(m_environment.executionStopwatch().elapsedTime().seconds(), WTFMove(event));
     }
-
-    m_trackedDeclarativeAnimationData.remove(it);
 }
 

trunk/Source/WebCore/inspector/agents/InspectorAnimationAgent.h

@@ -95 +95 @@
 
     struct TrackedDeclarativeAnimationData {
+        WTF_MAKE_STRUCT_FAST_ALLOCATED;
         String trackingAnimationId;
         ComputedEffectTiming lastComputedTiming;
     };
-    HashMap<DeclarativeAnimation*, TrackedDeclarativeAnimationData> m_trackedDeclarativeAnimationData;
+    HashMap<DeclarativeAnimation*, UniqueRef<TrackedDeclarativeAnimationData>> m_trackedDeclarativeAnimationData;
 };