Large canvas does not honor containing div's border radius

Source/core/platform/graphics/GraphicsLayer.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 106 matching lines @@
     , m_backfaceVisibility(true)
     , m_masksToBounds(false)
     , m_drawsContent(false)
     , m_contentsVisible(true)
     , m_showDebugBorder(false)
     , m_showRepaintCounter(false)
     , m_paintingPhase(GraphicsLayerPaintAllWithOverflowClip)
     , m_contentsOrientation(CompositingCoordinatesTopDown)
     , m_parent(0)
     , m_maskLayer(0)
+    , m_borderRadiusLayer(0)
     , m_replicaLayer(0)
     , m_replicatedLayer(0)
     , m_repaintCount(0)
     , m_contentsLayer(0)
     , m_contentsLayerId(0)
     , m_linkHighlight(0)
     , m_contentsLayerPurpose(NoContentsLayer)
     , m_scrollableArea(0)
 {
 #ifndef NDEBUG
@@ skipping 476 matching lines @@
 }
 
 void GraphicsLayer::updateContentsRect()
 {
     WebLayer* contentsLayer = contentsLayerIfRegistered();
     if (!contentsLayer)
         return;
 
     contentsLayer->setPosition(FloatPoint(m_contentsRect.x(), m_contentsRect.y()));
     contentsLayer->setBounds(IntSize(m_contentsRect.width(), m_contentsRect.height()));
+
+    if (m_borderRadiusLayer) {
+        if (m_borderRadiusLayer->size() != m_contentsRect.size()) {
+            m_borderRadiusLayer->setSize(m_contentsRect.size());
+            m_borderRadiusLayer->setNeedsDisplay();
+        }
+        m_borderRadiusLayer->setPosition(FloatPoint());
+        m_borderRadiusLayer->setOffsetFromRenderer(offsetFromRenderer() + IntSize(m_contentsRect.location().x(), m_contentsRect.location().y()));
+    }
 }
 
 static HashSet<int>* s_registeredLayerSet;
 
 void GraphicsLayer::registerContentsLayer(WebLayer* layer)
 {
     if (!s_registeredLayerSet)
         s_registeredLayerSet = new HashSet<int>;
     if (s_registeredLayerSet->contains(layer->id()))
         CRASH();
@@ skipping 43 matching lines @@
         m_contentsLayer->setAnchorPoint(FloatPoint(0, 0));
         m_contentsLayer->setUseParentBackfaceVisibility(true);
 
         // It is necessary to call setDrawsContent as soon as we receive the new contentsLayer, for
         // the correctness of early exit conditions in setDrawsContent() and setContentsVisible().
         m_contentsLayer->setDrawsContent(m_contentsVisible);
 
         // Insert the content layer first. Video elements require this, because they have
         // shadow content that must display in front of the video.
         m_layer->layer()->insertChild(m_contentsLayer, 0);
+        WebLayer* borderWebLayer = m_borderRadiusLayer ? m_borderRadiusLayer->platformLayer() : 0;
+        m_contentsLayer->setMaskLayer(borderWebLayer);
     }
     updateNames();
 }
 
 void GraphicsLayer::clearContentsLayerIfUnregistered()
 {
     if (!m_contentsLayerId || s_registeredLayerSet->contains(m_contentsLayerId))
         return;
 
     m_contentsLayer = 0;
@@ skipping 189 matching lines @@
             ts << "GraphicsLayerPaintBackground\n";
         }
         if (paintingPhase() & GraphicsLayerPaintForeground) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintForeground\n";
         }
         if (paintingPhase() & GraphicsLayerPaintMask) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintMask\n";
         }
+        if (paintingPhase() & GraphicsLayerPaintBorderRadiusMask) {
+            writeIndent(ts, indent + 2);
+            ts << "GraphicsLayerPaintBorderRadiusMask\n";
+        }
         if (paintingPhase() & GraphicsLayerPaintOverflowContents) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintOverflowContents\n";
         }
         if (paintingPhase() & GraphicsLayerPaintCompositedScroll) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintCompositedScroll\n";
         }
         writeIndent(ts, indent + 1);
         ts << ")\n";
@@ skipping 20 matching lines @@
     dumpLayer(ts, 0, flags);
     return ts.release();
 }
 
 void GraphicsLayer::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Layers);
     info.addMember(m_children, "children");
     info.addMember(m_parent, "parent");
     info.addMember(m_maskLayer, "maskLayer");
+    info.addMember(m_borderRadiusLayer, "borderRadiusLayer");
     info.addMember(m_replicaLayer, "replicaLayer");
     info.addMember(m_replicatedLayer, "replicatedLayer");
     info.ignoreMember(m_client);
     info.addMember(m_name, "name");
     info.addMember(m_nameBase, "nameBase");
     info.addMember(m_layer, "layer");
     info.addMember(m_imageLayer, "imageLayer");
     info.addMember(m_contentsLayer, "contentsLayer");
     info.addMember(m_linkHighlight, "linkHighlight");
     info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTrackingContentLayerDelegate");
@@ skipping 118 matching lines @@
 void GraphicsLayer::setMaskLayer(GraphicsLayer* maskLayer)
 {
     if (maskLayer == m_maskLayer)
         return;
 
     m_maskLayer = maskLayer;
     WebLayer* maskWebLayer = m_maskLayer ? m_maskLayer->platformLayer() : 0;
     m_layer->layer()->setMaskLayer(maskWebLayer);
 }
 
+void GraphicsLayer::setBorderRadiusLayer(GraphicsLayer* borderRadiusLayer)
+{
+    if (borderRadiusLayer == m_borderRadiusLayer)
+        return;
+
+    m_borderRadiusLayer = borderRadiusLayer;
+    WebLayer* borderRadiusWebLayer = m_borderRadiusLayer ? m_borderRadiusLayer->platformLayer() : 0;
+    if (hasContentsLayer())
+        contentsLayer()->setMaskLayer(borderRadiusWebLayer);
+    updateContentsRect();
+}
+
 void GraphicsLayer::setBackfaceVisibility(bool visible)
 {
     m_backfaceVisibility = visible;
     m_layer->setDoubleSided(m_backfaceVisibility);
 }
 
 void GraphicsLayer::setOpacity(float opacity)
 {
     float clampedOpacity = std::max(std::min(opacity, 1.0f), 0.0f);
     m_opacity = clampedOpacity;
@@ skipping 281 matching lines @@
 #ifndef NDEBUG
 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer)
 {
     if (!layer)
         return;
 
     String output = layer->layerTreeAsText(WebCore::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif