Title: [138790] trunk/Source/WebKit2
- Revision
- 138790
- Author
- christophe.du...@intel.com
- Date
- 2013-01-04 04:50:02 -0800 (Fri, 04 Jan 2013)
Log Message
Regression(r138728): Causes crashes on the build bots
https://bugs.webkit.org/show_bug.cgi?id=106083
Reviewed by Simon Hausmann.
Update encodeTimingFunction() to encode the x/y members only
if the bezierPreset is set to custom. This is needed because
decodeTimingFunction() only decodes x/y members if the
bezierPreset is set to custom.
This fixes assertion hits on the debug build bots.
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(CoreIPC::encodeTimingFunction):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (138789 => 138790)
--- trunk/Source/WebKit2/ChangeLog 2013-01-04 12:09:12 UTC (rev 138789)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-04 12:50:02 UTC (rev 138790)
@@ -1,3 +1,20 @@
+2013-01-04 Christophe Dumez <christophe.du...@intel.com>
+
+ Regression(r138728): Causes crashes on the build bots
+ https://bugs.webkit.org/show_bug.cgi?id=106083
+
+ Reviewed by Simon Hausmann.
+
+ Update encodeTimingFunction() to encode the x/y members only
+ if the bezierPreset is set to custom. This is needed because
+ decodeTimingFunction() only decodes x/y members if the
+ bezierPreset is set to custom.
+
+ This fixes assertion hits on the debug build bots.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (CoreIPC::encodeTimingFunction):
+
2013-01-04 Carlos Garcia Campos <cgar...@igalia.com>
[SOUP] Convert WebSoupRequestManagerProxy to be WebContextSupplement
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (138789 => 138790)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2013-01-04 12:09:12 UTC (rev 138789)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2013-01-04 12:50:02 UTC (rev 138790)
@@ -555,11 +555,14 @@
break;
case TimingFunction::CubicBezierFunction: {
const CubicBezierTimingFunction* cubic = static_cast<const CubicBezierTimingFunction*>(timingFunction);
- encoder.encodeEnum(cubic->timingFunctionPreset());
- encoder << cubic->x1();
- encoder << cubic->y1();
- encoder << cubic->x2();
- encoder << cubic->y2();
+ CubicBezierTimingFunction::TimingFunctionPreset bezierPreset = cubic->timingFunctionPreset();
+ encoder.encodeEnum(bezierPreset);
+ if (bezierPreset == CubicBezierTimingFunction::Custom) {
+ encoder << cubic->x1();
+ encoder << cubic->y1();
+ encoder << cubic->x2();
+ encoder << cubic->y2();
+ }
break;
}
case TimingFunction::StepsFunction: {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
