Part 1 of merges for Chromium bug #64589...

WebCore/rendering/RenderLayer.cpp

Index: WebCore/rendering/RenderLayer.cpp
===================================================================
--- WebCore/rendering/RenderLayer.cpp	(revision 73142)
+++ WebCore/rendering/RenderLayer.cpp	(working copy)
@@ -249,6 +249,15 @@
 #endif
 }
 
+bool RenderLayer::canRender3DTransforms() const
+{
+#if USE(ACCELERATED_COMPOSITING)
+    return compositor()->canRender3DTransforms();
+#else
+    return false;
+#endif
+}
+
 void RenderLayer::updateLayerPositions(UpdateLayerPositionsFlags flags, IntPoint* cachedOffset)
 {
     if (flags & DoFullRepaint) {
@@ -429,7 +438,7 @@
         ASSERT(box);
         m_transform->makeIdentity();
         box->style()->applyTransform(*m_transform, box->borderBoxRect().size(), RenderStyle::IncludeTransformOrigin);
-        makeMatrixRenderable(*m_transform, hasAcceleratedCompositing());
+        makeMatrixRenderable(*m_transform, canRender3DTransforms());
     }
 
     if (had3DTransform != has3DTransform())
@@ -446,7 +455,7 @@
         TransformationMatrix currTransform;
         RefPtr<RenderStyle> style = renderer()->animation()->getAnimatedStyleForRenderer(renderer());
         style->applyTransform(currTransform, renderBox()->borderBoxRect().size(), RenderStyle::IncludeTransformOrigin);
-        makeMatrixRenderable(currTransform, hasAcceleratedCompositing());
+        makeMatrixRenderable(currTransform, canRender3DTransforms());
         return currTransform;
     }
 #endif