WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/RenderLayerBacking.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 599 matching lines @@
 }
 
 // Map the given point from coordinates in the RenderLayer to GraphicsLayer coordinates.
 FloatPoint RenderLayerBacking::contentsToGraphicsLayerCoordinates(const GraphicsLayer* graphicsLayer, const FloatPoint& point)
 {
     return point - FloatSize(graphicsLayer->offsetFromRenderer());
 }
 
 bool RenderLayerBacking::paintingGoesToWindow() const
 {
-    return m_owningLayer->isDocumentLayer();
+    return m_owningLayer->isRootLayer();
 }
 
 void RenderLayerBacking::setContentsNeedDisplay()
 {
     if (m_graphicsLayer)
         m_graphicsLayer->setNeedsDisplay();
     if (m_contentsLayer)
         m_contentsLayer->setNeedsDisplay();
 }
 
@@ skipping 326 matching lines @@
         case CSSPropertyBackgroundColor:
             return AnimatedPropertyBackgroundColor;
         // It's fine if we see other css properties here; they are just not accelerated.
     }
     return AnimatedPropertyInvalid;
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)