Changeset 87707 in webkit

Timestamp:

May 30, 2011 7:21:49 PM (13 years ago)

Author:

noam.rosenthal@nokia.com

Message:

2011-05-30 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Simon Hausmann.

WebKit2: Enable serializing of data types needed for cross-process accelerated compositing
​https://bugs.webkit.org/show_bug.cgi?id=61694

Expose a public clearAll() function to reset WebCore::Animation.

No new functionality, so no new tests.

• platform/animation/Animation.h: (WebCore::Animation::clearAll):

2011-05-30 No'am Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Simon Hausmann.

WebKit2: Enable serializing of data types needed for cross-process accelerated compositing
​https://bugs.webkit.org/show_bug.cgi?id=61694

Create an ArgumentCoder for WebCore::Animation.

• Scripts/webkit2/messages.py:
• Shared/WebCoreArgumentCoders.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/animation/Animation.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Scripts/webkit2/messages.py (modified) (1 diff)
• WebKit2/Shared/WebCoreArgumentCoders.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-30  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        WebKit2: Enable serializing of data types needed for cross-process accelerated compositing
+        https://bugs.webkit.org/show_bug.cgi?id=61694
+
+        Expose a public clearAll() function to reset WebCore::Animation.
+
+        No new functionality, so no new tests.
+
+        * platform/animation/Animation.h:
+        (WebCore::Animation::clearAll):
+
 2011-05-30  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/animation/Animation.h

@@ -82 +82 @@
     void clearTimingFunction() { m_timingFunctionSet = false; }
 
+    void clearAll()
+    {
+        clearDelay();
+        clearDirection();
+        clearDuration();
+        clearFillMode();
+        clearIterationCount();
+        clearName();
+        clearPlayState();
+        clearProperty();
+        clearTimingFunction();
+    }
+
     double delay() const { return m_delay; }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-30  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        WebKit2: Enable serializing of data types needed for cross-process accelerated compositing
+        https://bugs.webkit.org/show_bug.cgi?id=61694
+
+        Create an ArgumentCoder for WebCore::Animation.
+
+        * Scripts/webkit2/messages.py:
+        * Shared/WebCoreArgumentCoders.h:
+
 2011-05-30  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/Source/WebKit2/Scripts/webkit2/messages.py

@@ -252 +252 @@
 def struct_or_class(namespace, type):
     structs = frozenset([
+        'WebCore::Animation',
         'WebCore::EditorCommandsForKeyEvent',
         'WebCore::CompositionUnderline',

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

@@ -32 +32 @@
 #include "Arguments.h"
 #include "ShareableBitmap.h"
+#include <WebCore/Animation.h>
 #include <WebCore/AuthenticationChallenge.h>
 #include <WebCore/BitmapImage.h>
@@ -560 +561 @@
 };
 
+template<> struct ArgumentCoder<WebCore::Animation> {
+    static bool encodeBoolAndReturnValue(ArgumentEncoder* encoder, bool value)
+    {
+        encoder->encodeBool(value);
+        return value;
+    }
+
+    template<typename T>
+    static void encodeBoolAndValue(ArgumentEncoder* encoder, bool isSet, const T& value)
+    {
+        if (encodeBoolAndReturnValue(encoder, isSet))
+            encoder->encode<T>(value);
+    }
+
+    static bool decodeBoolAndValue(ArgumentDecoder* decoder, bool& isSet, double& value)
+    {
+        if (!decoder->decodeBool(isSet))
+            return false;
+        if (!isSet)
+            return true;
+
+        return decoder->decodeDouble(value);
+    }
+
+    template<class T>
+    static bool decodeBoolAndValue(ArgumentDecoder* decoder, bool& isSet, T& value)
+    {
+        if (!decoder->decodeBool(isSet))
+            return false;
+        if (!isSet)
+            return true;
+
+        return ArgumentCoder<T>::decode(decoder, value);
+    }
+
+    static bool decodeBoolAndValue(ArgumentDecoder* decoder, bool& isSet, int& value)
+    {
+        if (!decoder->decodeBool(isSet))
+            return false;
+        if (!isSet)
+            return true;
+
+        return decoder->decodeInt32(value);
+    }
+
+    static void encode(ArgumentEncoder* encoder, const WebCore::Animation& animation)
+    {
+        encodeBoolAndValue(encoder, animation.isDelaySet(), animation.delay());
+        encodeBoolAndValue<int>(encoder, animation.isDirectionSet(), animation.direction());
+        encodeBoolAndValue(encoder, animation.isDurationSet(), animation.duration());
+        encodeBoolAndValue(encoder, animation.isFillModeSet(), animation.fillMode());
+        encodeBoolAndValue(encoder, animation.isIterationCountSet(), animation.iterationCount());
+
+        if (encodeBoolAndReturnValue(encoder, animation.isNameSet()))
+            ArgumentCoder<String>::encode(encoder, animation.name());
+
+        encodeBoolAndValue<int>(encoder, animation.isPlayStateSet(), animation.playState());
+        encodeBoolAndValue(encoder, animation.isPropertySet(), animation.property());
+
+        if (encodeBoolAndReturnValue(encoder, animation.isTimingFunctionSet()))
+            ArgumentCoder<RefPtr<WebCore::TimingFunction> >::encode(encoder, animation.timingFunction());
+        encoder->encodeBool(animation.isNoneAnimation());
+    }
+
+    static bool decode(ArgumentDecoder* decoder, WebCore::Animation& animation)
+    {
+        bool isDelaySet, isDirectionSet, isDurationSet, isFillModeSet, isIterationCountSet, isNameSet, isPlayStateSet, isPropertySet, isTimingFunctionSet;
+        int property, iterationCount, direction, fillMode, playState;
+        double delay, duration;
+        RefPtr<WebCore::TimingFunction> timingFunction;
+        String name;
+
+        animation.clearAll();
+
+        if (!decodeBoolAndValue(decoder, isDelaySet, delay))
+            return false;
+        if (!decodeBoolAndValue(decoder, isDirectionSet, direction))
+            return false;
+        if (!decodeBoolAndValue(decoder, isDurationSet, duration))
+            return false;
+        if (!decodeBoolAndValue(decoder, isFillModeSet, fillMode))
+            return false;
+        if (!decodeBoolAndValue(decoder, isIterationCountSet, iterationCount))
+            return false;
+        if (!decodeBoolAndValue<String>(decoder, isNameSet, name))
+            return false;
+        if (!decodeBoolAndValue(decoder, isPlayStateSet, playState))
+            return false;
+        if (!decodeBoolAndValue(decoder, isPropertySet, property))
+            return false;
+        if (!decodeBoolAndValue<RefPtr<WebCore::TimingFunction> >(decoder, isTimingFunctionSet, timingFunction))
+            return false;
+
+        if (isDelaySet)
+            animation.setDelay(delay);
+        if (isDirectionSet)
+            animation.setDirection(static_cast<WebCore::Animation::AnimationDirection>(direction));
+        if (isDurationSet)
+            animation.setDuration(duration);
+        if (isFillModeSet)
+            animation.setFillMode(fillMode);
+        if (isIterationCountSet)
+            animation.setIterationCount(iterationCount);
+        if (isNameSet)
+            animation.setName(name);
+        if (isPlayStateSet)
+            animation.setPlayState(static_cast<WebCore::EAnimPlayState>(playState));
+        if (isPropertySet)
+            animation.setProperty(property);
+        if (isTimingFunctionSet)
+            animation.setTimingFunction(timingFunction);
+
+        return true;
+    }
+};
+
 } // namespace CoreIPC