[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[inferno at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 69750b67436460dc6107eaf6c24e8c7ed9f05c60
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 18:21:53 2010 +0000

    2010-09-24  Abhishek Arya  <inferno at chromium.org>
    
            Reviewed by Simon Fraser.
    
            Comply with spec by generalizing container on which transforms can be applied.
            https://bugs.webkit.org/show_bug.cgi?id=46485
    
            Already covered by existing tests.
    
            * rendering/RenderObject.cpp:
            (WebCore::RenderObject::getTransformFromContainer):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index da44b17..047e484 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-24  Abhishek Arya  <inferno at chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        Comply with spec by generalizing container on which transforms can be applied.
+        https://bugs.webkit.org/show_bug.cgi?id=46485
+
+        Already covered by existing tests.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::getTransformFromContainer):
+
 2010-09-24  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp
index 8961482..9a60ea6 100644
--- a/WebCore/rendering/RenderObject.cpp
+++ b/WebCore/rendering/RenderObject.cpp
@@ -1988,10 +1988,10 @@ void RenderObject::getTransformFromContainer(const RenderObject* containerObject
         transform.multLeft(layer->currentTransform());
     
 #if ENABLE(3D_RENDERING)
-    if (containerObject && containerObject->isBox() && containerObject->hasLayer() && containerObject->style()->hasPerspective()) {
+    if (containerObject && containerObject->hasLayer() && containerObject->style()->hasPerspective()) {
         // Perpsective on the container affects us, so we have to factor it in here.
         ASSERT(containerObject->hasLayer());
-        FloatPoint perspectiveOrigin = toRenderBox(containerObject)->layer()->perspectiveOrigin();
+        FloatPoint perspectiveOrigin = toRenderBoxModelObject(containerObject)->layer()->perspectiveOrigin();
 
         TransformationMatrix perspectiveMatrix;
         perspectiveMatrix.applyPerspective(containerObject->style()->perspective());

-- 
WebKit Debian packaging