[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
mitz at apple.com
mitz at apple.com
Thu Dec 3 13:19:50 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit d2d5ccdca772c1118d4d9df7011a3b29124069ee
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 26 23:56:41 2009 +0000
WebCore: Re-add CSSPropertyWebkitBackgroundSize in one more place
Reviewed by Beth Dakin.
Fixes transitions/multiple-background-size-transitions.html, transitions/background-transitions.html
* page/animation/AnimationBase.cpp:
(WebCore::FillLayersPropertyWrapper::FillLayersPropertyWrapper):
LayoutTests: Use -webkit-background-size as the transition property in this test now
that it is distinct from background-size.
Reviewed by Sam Weinig.
* transitions/multiple-background-size-transitions.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50115 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cd5334b..932e0ea 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,14 @@
2009-10-26 Dan Bernstein <mitz at apple.com>
+ Reviewed by Sam Weinig.
+
+ Use -webkit-background-size as the transition property in this test now
+ that it is distinct from background-size.
+
+ * transitions/multiple-background-size-transitions.html:
+
+2009-10-26 Dan Bernstein <mitz at apple.com>
+
Rubber-stamped by Beth Dakin.
Update expedted results after r50108.
diff --git a/LayoutTests/transitions/multiple-background-size-transitions.html b/LayoutTests/transitions/multiple-background-size-transitions.html
index 54cc943..22af4eb 100644
--- a/LayoutTests/transitions/multiple-background-size-transitions.html
+++ b/LayoutTests/transitions/multiple-background-size-transitions.html
@@ -13,7 +13,7 @@
-webkit-mask-repeat: no-repeat;
-webkit-transition-duration: 1s;
-webkit-transition-timing-function: linear;
- -webkit-transition-property: background-size, -webkit-mask-size;
+ -webkit-transition-property: -webkit-background-size, -webkit-mask-size;
}
#box {
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 335f10d..887e287 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-26 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Beth Dakin.
+
+ Re-add CSSPropertyWebkitBackgroundSize in one more place
+
+ Fixes transitions/multiple-background-size-transitions.html, transitions/background-transitions.html
+
+ * page/animation/AnimationBase.cpp:
+ (WebCore::FillLayersPropertyWrapper::FillLayersPropertyWrapper):
+
2009-10-26 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/page/animation/AnimationBase.cpp b/WebCore/page/animation/AnimationBase.cpp
index ec0e284..59797da 100644
--- a/WebCore/page/animation/AnimationBase.cpp
+++ b/WebCore/page/animation/AnimationBase.cpp
@@ -468,6 +468,7 @@ public:
m_fillLayerPropertyWrapper = new FillLayerPropertyWrapper<Length>(&FillLayer::yPosition, &FillLayer::setYPosition);
break;
case CSSPropertyBackgroundSize:
+ case CSSPropertyWebkitBackgroundSize:
case CSSPropertyWebkitMaskSize:
m_fillLayerPropertyWrapper = new FillLayerPropertyWrapper<LengthSize>(&FillLayer::sizeLength, &FillLayer::setSizeLength);
break;
@@ -592,6 +593,7 @@ static void ensurePropertyMap()
gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyBackgroundPositionX, &RenderStyle::backgroundLayers, &RenderStyle::accessBackgroundLayers));
gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyBackgroundPositionY, &RenderStyle::backgroundLayers, &RenderStyle::accessBackgroundLayers));
gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyBackgroundSize, &RenderStyle::backgroundLayers, &RenderStyle::accessBackgroundLayers));
+ gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitBackgroundSize, &RenderStyle::backgroundLayers, &RenderStyle::accessBackgroundLayers));
gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMaskPositionX, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers));
gPropertyWrappers->append(new FillLayersPropertyWrapper(CSSPropertyWebkitMaskPositionY, &RenderStyle::maskLayers, &RenderStyle::accessMaskLayers));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list