Merge 68158

WebCore/rendering/RenderObject.cpp

Index: WebCore/rendering/RenderObject.cpp
===================================================================
--- WebCore/rendering/RenderObject.cpp	(revision 68300)
+++ WebCore/rendering/RenderObject.cpp	(working copy)
@@ -1988,7 +1988,7 @@
         transform.multLeft(layer->currentTransform());
     
 #if ENABLE(3D_RENDERING)
-    if (containerObject && containerObject->hasLayer() && containerObject->style()->hasPerspective()) {
+    if (containerObject && containerObject->isBox() && 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();