Changeset 87701 in webkit

Timestamp:

May 30, 2011 4:43:58 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

Added a public TimingFunction::type() method.

No new functionality, so no new tests.

• platform/animation/TimingFunction.h: (WebCore::TimingFunction::type):

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

Add an ArgumentCoder for WebCore::TimingFunction. This serializer can create the appropriate
TimingFunction subclass based on the type of timing function.

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

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/animation/TimingFunction.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
+
+        Added a public TimingFunction::type() method.
+
+        No new functionality, so no new tests.
+
+        * platform/animation/TimingFunction.h:
+        (WebCore::TimingFunction::type):
+
 2011-05-30  Noam Rosenthal  <noam.rosenthal@nokia.com>
 

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

@@ -38 +38 @@
     
     virtual ~TimingFunction() { }
+
+    TimingFunctionType type() const { return m_type; }
     
     bool isLinearTimingFunction() const { return m_type == LinearFunction; }

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
+
+        Add an ArgumentCoder for WebCore::TimingFunction. This serializer can create the appropriate
+        TimingFunction subclass based on the type of timing function.
+
+        * Scripts/webkit2/messages.py:
+        * Shared/WebCoreArgumentCoders.h:
+
 2011-05-30  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

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

@@ -259 +259 @@
         'WebCore::PluginInfo',
         'WebCore::PrintInfo',
+        'WebCore::TimingFunction',
         'WebCore::TransformationMatrix',
         'WebCore::ViewportArguments',

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

@@ -49 +49 @@
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/TextCheckerClient.h>
+#include <WebCore/TimingFunction.h>
 #include <WebCore/TransformationMatrix.h>
 #include <WebCore/ViewportArguments.h>
@@ -486 +487 @@
 };
 
+template<> struct ArgumentCoder<RefPtr<WebCore::TimingFunction> > {
+    static void encode(ArgumentEncoder* encoder, const RefPtr<WebCore::TimingFunction>& function)
+    {
+        // We don't want to encode null-references.
+        ASSERT(function);
+
+        WebCore::TimingFunction::TimingFunctionType type = function->type();
+        encoder->encodeInt32(type);
+        switch (type) {
+        case WebCore::TimingFunction::LinearFunction:
+            break;
+        case WebCore::TimingFunction::CubicBezierFunction: {
+            WebCore::CubicBezierTimingFunction* cubicFunction = static_cast<WebCore::CubicBezierTimingFunction*>(function.get());
+            encoder->encodeDouble(cubicFunction->x1());
+            encoder->encodeDouble(cubicFunction->y1());
+            encoder->encodeDouble(cubicFunction->x2());
+            encoder->encodeDouble(cubicFunction->y2());
+            break;
+        }
+        case WebCore::TimingFunction::StepsFunction: {
+            WebCore::StepsTimingFunction* stepsFunction = static_cast<WebCore::StepsTimingFunction*>(function.get());
+            encoder->encodeInt32(stepsFunction->numberOfSteps());
+            encoder->encodeBool(stepsFunction->stepAtStart());
+            break;
+        }
+        }
+    }
+
+    static bool decode(ArgumentDecoder* decoder, RefPtr<WebCore::TimingFunction>& function)
+    {
+        WebCore::TimingFunction::TimingFunctionType type;
+        int typeInt;
+        if (!decoder->decodeInt32(typeInt))
+            return false;
+
+        type = static_cast<WebCore::TimingFunction::TimingFunctionType>(typeInt);
+        switch (type) {
+        case WebCore::TimingFunction::LinearFunction:
+            function = WebCore::LinearTimingFunction::create();
+            return true;
+
+        case WebCore::TimingFunction::CubicBezierFunction: {
+            double x1, y1, x2, y2;
+            if (!decoder->decodeDouble(x1))
+                return false;
+            if (!decoder->decodeDouble(y1))
+                return false;
+            if (!decoder->decodeDouble(x2))
+                return false;
+            if (!decoder->decodeDouble(y2))
+                return false;
+            function = WebCore::CubicBezierTimingFunction::create(x1, y1, x2, y2);
+            return true;
+        }
+
+        case WebCore::TimingFunction::StepsFunction: {
+            int numSteps;
+            bool stepAtStart;
+            if (!decoder->decodeInt32(numSteps))
+                return false;
+            if (!decoder->decodeBool(stepAtStart))
+                return false;
+
+            function = WebCore::StepsTimingFunction::create(numSteps, stepAtStart);
+            return true;
+        }
+
+        }
+
+        return false;
+    }
+};
+
 } // namespace CoreIPC