Source/WebCore: WebCore part of <rdar://problem/9155590> Broken animation in iAd...

Reviewed by Simon Fraser.

* WebCore.exp.in: Export wkExecutableWasLinkedOnOrBeforeSnowLeopard.
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::createTransformAnimationsFromKeyframes): Account for the binary-compatiblity
check in Core Animation.
* platform/mac/WebCoreSystemInterface.h: Added wkExecutableWasLinkedOnOrBeforeSnowLeopard.
* platform/mac/WebCoreSystemInterface.mm: Ditto.

Source/WebKit/mac: WebKit part of <rdar://problem/9155590> Broken animation in iAd producer

Reviewed by Simon Fraser.

* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Initialize wkExecutableWasLinkedOnOrBeforeSnowLeopard.

Source/WebKit2: WebKit2 part of <rdar://problem/9155590> Broken animation in iAd producer

Reviewed by Simon Fraser.

* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Initialize wkExecutableWasLinkedOnOrBeforeSnowLeopard.

WebKitLibraries: WebKitSystemInterface part of <rdar://problem/9155590> Broken animation in iAd producer

Reviewed by Simon Fraser.

* WebKitSystemInterface.h: Added WKExecutableWasLinkedOnOrBeforeSnowLeopard().

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@85901 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a31941a4d373f42537056114b772ffa5e2aa9e8b..bf348b1a9d1d68d572791fac17ee92637904c20c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-05-05  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        WebCore part of <rdar://problem/9155590> Broken animation in iAd producer
+
+        * WebCore.exp.in: Export wkExecutableWasLinkedOnOrBeforeSnowLeopard.
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::createTransformAnimationsFromKeyframes): Account for the binary-compatiblity
+        check in Core Animation.
+        * platform/mac/WebCoreSystemInterface.h: Added wkExecutableWasLinkedOnOrBeforeSnowLeopard.
+        * platform/mac/WebCoreSystemInterface.mm: Ditto.
+
 2011-05-05  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Anders Carlsson.

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index 0e562b5fdd5e8cc7122f4f463d66f2bbf18288e9..c54ffcd368a6fde96b33aef778b483672d6b43f2 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1419,6 +1419,7 @@ _wkContentAreaWillPaint
 _wkCreateCTTypesetterWithUniCharProviderAndOptions
 _wkDidBeginScrollGesture
 _wkDidEndScrollGesture
+_wkExecutableWasLinkedOnOrBeforeSnowLeopard
 _wkHorizontalScrollbarPainterForController
 _wkIOSurfaceContextCreate
 _wkIOSurfaceContextCreateImage

diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
index 0545015a4dfbc457b9b203ffec45d6c4e4786b87..38848c2ff38dbfd8a1c931f2c14b9dfc76901040 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
@@ -43,6 +43,10 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/text/StringConcatenate.h>
 
+#if PLATFORM(MAC)
+#include "WebCoreSystemInterface.h"
+#endif
+
 using namespace std;
 
 #define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_LEOPARD))
@@ -1612,15 +1616,20 @@ bool GraphicsLayerCA::createTransformAnimationsFromKeyframes(const KeyframeValue
         TransformOperation::OperationType transformOp = isMatrixAnimation ? TransformOperation::MATRIX_3D : functionList[animationIndex];
         RefPtr<PlatformCAAnimation> caAnimation;
 
-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) || PLATFORM(WIN)
-        // CA applies animations in reverse order (<rdar://problem/7095638>) so we need the last one we add (per property)
-        // to be non-additive.
+        bool additive;
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !PLATFORM(WIN)
+        // Old vertsions of Core Animation apply animations in reverse order (<rdar://problem/7095638>) so we need the last one we add (per property)
+        // to be non-additive. For binary compatibility, the current version of Core Animation preserves this behaviors for applications linked
+        // on or before Snow Leopard.
         // FIXME: This fix has not been added to QuartzCore on Windows yet (<rdar://problem/9112233>) so we expect the
         // reversed animation behavior
-        bool additive = animationIndex < (numAnimations - 1);
-#else
-        bool additive = animationIndex > 0;
+        static bool executableWasLinkedOnOrBeforeSnowLeopard = wkExecutableWasLinkedOnOrBeforeSnowLeopard();
+        if (!executableWasLinkedOnOrBeforeSnowLeopard)
+            additive = animationIndex > 0;
+        else
 #endif
+            additive = animationIndex < (numAnimations - 1);
+
         if (isKeyframe) {
             caAnimation = createKeyframeAnimation(animation, valueList.property(), additive);
             validMatrices = setTransformAnimationKeyframes(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize);

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.h b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
index f68358009392a310ca82673e3553a0674d6bf173..798deee16d0822d06abe40ab172c8c77123310e3 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.h
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
@@ -258,6 +258,8 @@ extern void (*wkDidBeginScrollGesture)(WKScrollbarPainterControllerRef);
 extern void (*wkDidEndScrollGesture)(WKScrollbarPainterControllerRef);
 
 extern bool (*wkScrollbarPainterUsesOverlayScrollers)(void);
+
+extern bool (*wkExecutableWasLinkedOnOrBeforeSnowLeopard)(void);
 #endif
 
 extern void (*wkUnregisterUniqueIdForElement)(id element);

diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
index 9ef157a2ab80a1c4bb033e96d2d05f2f87c72756..6e625f58eb05deb3c34cc8dcbd36c3ea1dda3aa6 100644 (file)
--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
@@ -154,6 +154,8 @@ void (*wkDidBeginScrollGesture)(WKScrollbarPainterControllerRef);
 void (*wkDidEndScrollGesture)(WKScrollbarPainterControllerRef);
 
 bool (*wkScrollbarPainterUsesOverlayScrollers)(void);
+
+bool (*wkExecutableWasLinkedOnOrBeforeSnowLeopard)(void);
 #endif
 
 void (*wkUnregisterUniqueIdForElement)(id element);

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 1b213f27254d848d69da457a7a15f3201630cae6..0c3d2b0c3017fde536e50a6a11aea73cb0e12d50 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-05  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        WebKit part of <rdar://problem/9155590> Broken animation in iAd producer
+
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Initialize wkExecutableWasLinkedOnOrBeforeSnowLeopard.
+
 2011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
index f2c559d6bb5af6a387e76c2c92696ec4435c1842..e6afb92f438c2c1ad788d76c549785782d7c2fa1 100644 (file)
--- a/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm
@@ -150,6 +150,7 @@ void InitWebCoreSystemInterface(void)
     INIT(DidBeginScrollGesture);
     INIT(DidEndScrollGesture);
     INIT(ScrollbarPainterUsesOverlayScrollers);
+    INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
 #endif
 
     INIT(GetAXTextMarkerTypeID);

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 1293452f8b4b0d7d04da6434cd943a6640f33842..35ac060d8134dea1c9806e5c2dad171aeb9a3619 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-05  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        WebKit2 part of <rdar://problem/9155590> Broken animation in iAd producer
+
+        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface): Initialize wkExecutableWasLinkedOnOrBeforeSnowLeopard.
+
 2011-05-05  Keith Kyzivat  <keith.kyzivat@nokia.com>
 
         Reviewed by Laszlo Gombos.

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
index 06cf6c53843404d866e92f86615eba1b4fcd8634..9a0f9fa778ba8c0eb9fa2290b1e09a1b829a8818 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
@@ -144,6 +144,7 @@ void InitWebCoreSystemInterface(void)
         INIT(DidBeginScrollGesture);
         INIT(DidEndScrollGesture);
         INIT(ScrollbarPainterUsesOverlayScrollers);
+        INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
 #else
         INIT(GetHyphenationLocationBeforeIndex);
         INIT(GetNSEventMomentumPhase);

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 7fd837089c215fef3f6cf630e66e24a6229e16e8..d184b529bd32ddf8744737c6186f4e166e2425d6 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-05  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        WebKitSystemInterface part of <rdar://problem/9155590> Broken animation in iAd producer
+
+        * WebKitSystemInterface.h: Added WKExecutableWasLinkedOnOrBeforeSnowLeopard().
+
 2011-04-29  Jer Noble  <jer.noble@apple.com>
 
         Reviewed by Eric Seidel.

diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index 64c387a28c4b6277bd975985930e05a4a4a88960..a213c263fe44dea054165a699ea3f8d73971ad51 100644 (file)
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -448,6 +448,8 @@ void WKDidEndScrollGesture(WKScrollbarPainterControllerRef);
 
 bool WKScrollbarPainterUsesOverlayScrollers(void);
 
+bool WKExecutableWasLinkedOnOrBeforeSnowLeopard(void);
+
 NSRange WKExtractWordDefinitionTokenRangeFromContextualString(NSString *contextString, NSRange range, NSDictionary **options);
 void WKShowWordDefinitionWindow(NSAttributedString *term, NSPoint screenPoint, NSDictionary *options);
 void WKHideWordDefinitionWindow(void);