diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/platform/animation/TimingFunction.h | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/platform/animation/TimingFunction.h')
| -rw-r--r-- | WebCore/platform/animation/TimingFunction.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/WebCore/platform/animation/TimingFunction.h b/WebCore/platform/animation/TimingFunction.h index f114596..d3f71ff 100644 --- a/WebCore/platform/animation/TimingFunction.h +++ b/WebCore/platform/animation/TimingFunction.h @@ -29,7 +29,7 @@ namespace WebCore { -struct TimingFunction { +struct TimingFunction : FastAllocBase { TimingFunction() : m_type(CubicBezierTimingFunction) , m_x1(0.25) @@ -39,6 +39,16 @@ struct TimingFunction { { } + // This explicit copy constructor works around an inlining bug in GCC 4.2 (only reproed on mac, but may exist on other platforms). + TimingFunction(const TimingFunction& that) + : m_type(that.m_type) + , m_x1(that.m_x1) + , m_y1(that.m_y1) + , m_x2(that.m_x2) + , m_y2(that.m_y2) + { + } + TimingFunction(ETimingFunctionType timingFunction, double x1 = 0.0, double y1 = 0.0, double x2 = 1.0, double y2 = 1.0) : m_type(timingFunction) , m_x1(x1) |