Title: [132296] trunk/Source/WebKit2
- Revision
- 132296
- Author
- noam.rosent...@nokia.com
- Date
- 2012-10-23 21:01:14 -0700 (Tue, 23 Oct 2012)
Log Message
Coordinated Graphics: Enable threaded/IPC animations
https://bugs.webkit.org/show_bug.cgi?id=93146
Unreviewed build fix, some function names changed between review and landing.
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(CoreIPC::encodeTimingFunction):
(CoreIPC::decodeTimingFunction):
(CoreIPC::::encode):
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (132295 => 132296)
--- trunk/Source/WebKit2/ChangeLog 2012-10-24 03:21:10 UTC (rev 132295)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-24 04:01:14 UTC (rev 132296)
@@ -1,3 +1,17 @@
+2012-10-23 No'am Rosenthal <noam.rosent...@nokia.com>
+
+ Coordinated Graphics: Enable threaded/IPC animations
+ https://bugs.webkit.org/show_bug.cgi?id=93146
+
+ Unreviewed build fix, some function names changed between review and landing.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (CoreIPC::encodeTimingFunction):
+ (CoreIPC::decodeTimingFunction):
+ (CoreIPC::::encode):
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
+ (WebCore):
+
2012-10-23 Sam Weinig <s...@webkit.org>
Stop using NSHomeDirectory() to get the home directory, it doesn't always return what we want
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (132295 => 132296)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2012-10-24 03:21:10 UTC (rev 132295)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2012-10-24 04:01:14 UTC (rev 132296)
@@ -521,16 +521,16 @@
break;
case TimingFunction::CubicBezierFunction: {
const CubicBezierTimingFunction* cubic = static_cast<const CubicBezierTimingFunction*>(timingFunction);
- encoder->encodeDouble(cubic->x1());
- encoder->encodeDouble(cubic->y1());
- encoder->encodeDouble(cubic->x2());
- encoder->encodeDouble(cubic->y2());
+ encoder->encode(cubic->x1());
+ encoder->encode(cubic->y1());
+ encoder->encode(cubic->x2());
+ encoder->encode(cubic->y2());
break;
}
case TimingFunction::StepsFunction: {
const StepsTimingFunction* steps = static_cast<const StepsTimingFunction*>(timingFunction);
- encoder->encodeInt32(steps->numberOfSteps());
- encoder->encodeBool(steps->stepAtStart());
+ encoder->encode(static_cast<uint32_t>(steps->numberOfSteps()));
+ encoder->encode(steps->stepAtStart());
break;
}
}
@@ -564,9 +564,9 @@
return true;
}
case TimingFunction::StepsFunction: {
- int numberOfSteps;
+ uint32_t numberOfSteps;
bool stepAtStart;
- if (!decoder->decodeInt32(numberOfSteps))
+ if (!decoder->decodeUInt32(numberOfSteps))
return false;
if (!decoder->decodeBool(stepAtStart))
return false;
@@ -584,27 +584,27 @@
encoder->encode(animation.name());
encoder->encode(animation.boxSize());
encoder->encodeEnum(animation.state());
- encoder->encodeDouble(animation.startTime());
- encoder->encodeDouble(animation.pauseTime());
- encoder->encodeBool(animation.listsMatch());
+ encoder->encode(animation.startTime());
+ encoder->encode(animation.pauseTime());
+ encoder->encode(animation.listsMatch());
RefPtr<Animation> animationObject = animation.animation();
encoder->encodeEnum(animationObject->direction());
- encoder->encodeUInt32(animationObject->fillMode());
- encoder->encodeDouble(animationObject->duration());
- encoder->encodeDouble(animationObject->iterationCount());
+ encoder->encode(static_cast<uint32_t>(animationObject->fillMode()));
+ encoder->encode(animationObject->duration());
+ encoder->encode(animationObject->iterationCount());
encodeTimingFunction(encoder, animationObject->timingFunction().get());
const KeyframeValueList& keyframes = animation.keyframes();
encoder->encodeEnum(keyframes.property());
- encoder->encodeUInt32(keyframes.size());
+ encoder->encode(static_cast<uint32_t>(keyframes.size()));
for (size_t i = 0; i < keyframes.size(); ++i) {
const AnimationValue* value = keyframes.at(i);
- encoder->encodeFloat(value->keyTime());
+ encoder->encode(value->keyTime());
encodeTimingFunction(encoder, value->timingFunction());
switch (keyframes.property()) {
case AnimatedPropertyOpacity:
- encoder->encodeFloat(static_cast<const FloatAnimationValue*>(value)->value());
+ encoder->encode(static_cast<const FloatAnimationValue*>(value)->value());
break;
case AnimatedPropertyWebkitTransform:
encoder->encode(*static_cast<const TransformAnimationValue*>(value)->value());
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h (132295 => 132296)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2012-10-24 03:21:10 UTC (rev 132295)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2012-10-24 04:01:14 UTC (rev 132296)
@@ -36,16 +36,13 @@
class GraphicsLayerAnimation;
class GraphicsLayerAnimations;
class TransformationMatrix;
+class TransformOperations;
struct Length;
#if ENABLE(CSS_FILTERS)
class FilterOperations;
#endif
-#if ENABLE(CSS_SHADERS)
-class TransformOperations;
-#endif
-
#if USE(GRAPHICS_SURFACE)
struct GraphicsSurfaceToken;
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
