Add CanvasSurfaceLayerBridge

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 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 105 matching lines @@
 static inline bool isAcceleratedCanvas(const LayoutObject* layoutObject)
 {
     if (layoutObject->isCanvas()) {
         HTMLCanvasElement* canvas = toHTMLCanvasElement(layoutObject->node());
         if (CanvasRenderingContext* context = canvas->renderingContext())
             return context->isAccelerated();
     }
     return false;
 }
 
+static inline bool isCanvasTransferedFromOffscreen(const LayoutObject* layoutObject)

[Justin Novosad, 2016/05/20 19:58:26]

isCanvasControlledByOffscreen

+{
+    if (layoutObject->isCanvas()) {
+        HTMLCanvasElement* canvas = toHTMLCanvasElement(layoutObject->node());
+        if (!!canvas->surfaceLayerBridge())

[Justin Novosad, 2016/05/20 19:58:26]

"!!" is not necessary

+            return true;
+    }
+    return false;
+}
+
 static bool hasBoxDecorationsOrBackgroundImage(const ComputedStyle& style)
 {
     return style.hasBoxDecorations() || style.hasBackgroundImage();
 }
 
 static bool contentLayerSupportsDirectBackgroundComposition(const LayoutObject* layoutObject)
 {
     // No support for decorations - border, border-radius or outline.
     // Only simple background - solid color or transparent.
     if (hasBoxDecorationsOrBackgroundImage(layoutObject->styleRef()))
@@ skipping 395 matching lines @@
         m_graphicsLayer->setContentsToPlatformLayer(layer);
     } else if (layoutObject->node() && layoutObject->node()->isFrameOwnerElement() && toHTMLFrameOwnerElement(layoutObject->node())->contentFrame()) {
         Frame* frame = toHTMLFrameOwnerElement(layoutObject->node())->contentFrame();
         if (frame->isRemoteFrame()) {
             WebLayer* layer = toRemoteFrame(frame)->remotePlatformLayer();
             m_graphicsLayer->setContentsToPlatformLayer(layer);
         }
     } else if (layoutObject->isVideo()) {
         HTMLMediaElement* mediaElement = toHTMLMediaElement(layoutObject->node());
         m_graphicsLayer->setContentsToPlatformLayer(mediaElement->platformLayer());
+    } else if (isCanvasTransferedFromOffscreen(layoutObject)) {
+        HTMLCanvasElement* canvas = toHTMLCanvasElement(layoutObject->node());
+        m_graphicsLayer->setContentsToPlatformLayer(canvas->surfaceLayerBridge()->getWebLayer());
+        layerConfigChanged = true;
     } else if (isAcceleratedCanvas(layoutObject)) {
         HTMLCanvasElement* canvas = toHTMLCanvasElement(layoutObject->node());
         if (CanvasRenderingContext* context = canvas->renderingContext())
             m_graphicsLayer->setContentsToPlatformLayer(context->platformLayer());
         layerConfigChanged = true;
     }
     if (layoutObject->isLayoutPart()) {
         if (PaintLayerCompositor::attachFrameContentLayersToIframeLayer(toLayoutPart(layoutObject)))
             layerConfigChanged = true;
     }
@@ skipping 2022 matching lines @@
     } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
         name = "Scrolling Contents Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink