[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[japhet at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8c3ed29b4db4c33665e633175a27e3bf05578996
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 20:24:30 2010 +0000

    2010-03-11  Nate Chapin  <japhet at chromium.org>
    
            Unreviewed, Chromium mac build fix.
    
            Add an explicit copy constructor to TimingFunction.
            http://trac.webkit.org/changeset/55835 trigged an inlining
            bug in gcc that the copy constructor resolves.
    
            * platform/animation/TimingFunction.h:
            (WebCore::TimingFunction::TimingFunction):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55853 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f5a4259..48b9272 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-11  Nate Chapin  <japhet at chromium.org>
+
+        Unreviewed, Chromium mac build fix.
+
+        Add an explicit copy constructor to TimingFunction.
+        http://trac.webkit.org/changeset/55835 trigged an inlining
+        bug in gcc that the copy constructor resolves.
+
+        * platform/animation/TimingFunction.h:
+        (WebCore::TimingFunction::TimingFunction):
+
 2010-03-11  Chris Fleizach  <cfleizach at apple.com>
 
         Fixing GTK. No review.
diff --git a/WebCore/platform/animation/TimingFunction.h b/WebCore/platform/animation/TimingFunction.h
index ffcc4b8..e02889d 100644
--- a/WebCore/platform/animation/TimingFunction.h
+++ b/WebCore/platform/animation/TimingFunction.h
@@ -39,6 +39,16 @@ struct TimingFunction : FastAllocBase {
     {
     }
 
+    // This explicit copy constructor works around an inlining bug in GCC.
+    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)

-- 
WebKit Debian packaging