Refactor GraphicsLayer::setContentsToImage().

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 83 matching lines @@
     , m_paintingPhase(GraphicsLayerPaintAllWithOverflowClip)
     , m_contentsOrientation(CompositingCoordinatesTopDown)
     , m_parent(0)
     , m_maskLayer(0)
     , m_contentsClippingMaskLayer(0)
     , m_replicaLayer(0)
     , m_replicatedLayer(0)
     , m_paintCount(0)
     , m_contentsLayer(0)
     , m_contentsLayerId(0)
-    , m_contentsLayerPurpose(NoContentsLayer)
     , m_scrollableArea(0)
     , m_compositingReasons(blink::CompositingReasonUnknown)
 {
 #ifndef NDEBUG
     if (m_client)
         m_client->verifyNotPainting();
 #endif
 
     m_opaqueRectTrackingContentLayerDelegate = adoptPtr(new OpaqueRectTrackingContentLayerDelegate(this));
     m_layer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(m_opaqueRectTrackingContentLayerDelegate.get()));
@@ skipping 327 matching lines @@
 }
 
 void GraphicsLayer::unregisterContentsLayer(WebLayer* layer)
 {
     ASSERT(s_registeredLayerSet);
     if (!s_registeredLayerSet->contains(layer->id()))
         CRASH();
     s_registeredLayerSet->remove(layer->id());
 }
 
-void GraphicsLayer::setContentsTo(ContentsLayerPurpose purpose, WebLayer* layer)
+void GraphicsLayer::setContentsTo(WebLayer* layer)
 {
     bool childrenChanged = false;
     if (layer) {
         ASSERT(s_registeredLayerSet);
         if (!s_registeredLayerSet->contains(layer->id()))
             CRASH();
         if (m_contentsLayerId != layer->id()) {
             setupContentsLayer(layer);
-            m_contentsLayerPurpose = purpose;
             childrenChanged = true;
         }
         updateContentsRect();
     } else {
         if (m_contentsLayer) {
             childrenChanged = true;
 
             // The old contents layer will be removed via updateChildList.
             m_contentsLayer = 0;
             m_contentsLayerId = 0;
@@ skipping 493 matching lines @@
 {
     if (rect == m_contentsRect)
         return;
 
     m_contentsRect = rect;
     updateContentsRect();
 }
 
 void GraphicsLayer::setContentsToImage(Image* image)
 {
-    bool childrenChanged = false;
     RefPtr<NativeImageSkia> nativeImage = image ? image->nativeImageForCurrentFrame() : 0;
     if (nativeImage) {
-        if (m_contentsLayerPurpose != ContentsLayerForImage) {
+        if (!m_imageLayer) {
             m_imageLayer = adoptPtr(Platform::current()->compositorSupport()->createImageLayer());
             registerContentsLayer(m_imageLayer->layer());
-
-            setupContentsLayer(m_imageLayer->layer());
-            m_contentsLayerPurpose = ContentsLayerForImage;
-            childrenChanged = true;
         }
         m_imageLayer->setBitmap(nativeImage->bitmap());
         m_imageLayer->layer()->setOpaque(image->currentFrameKnownToBeOpaque());
         updateContentsRect();
     } else {
         if (m_imageLayer) {
-            childrenChanged = true;
-
             unregisterContentsLayer(m_imageLayer->layer());
             m_imageLayer.clear();
         }
-        // The old contents layer will be removed via updateChildList.
-        m_contentsLayer = 0;
     }
 
-    if (childrenChanged)
-        updateChildList();
+    setContentsTo(m_imageLayer ? m_imageLayer->layer() : 0);
 }
 
 void GraphicsLayer::setContentsToNinePatch(Image* image, const IntRect& aperture)
 {
     if (m_ninePatchLayer) {
         unregisterContentsLayer(m_ninePatchLayer->layer());
         m_ninePatchLayer.clear();
     }
     RefPtr<NativeImageSkia> nativeImage = image ? image->nativeImageForCurrentFrame() : 0;
     if (nativeImage) {
         m_ninePatchLayer = adoptPtr(Platform::current()->compositorSupport()->createNinePatchLayer());
         m_ninePatchLayer->setBitmap(nativeImage->bitmap(), aperture);
         m_ninePatchLayer->layer()->setOpaque(image->currentFrameKnownToBeOpaque());
         registerContentsLayer(m_ninePatchLayer->layer());
     }
-    setContentsTo(ContentsLayerForNinePatch, m_ninePatchLayer ? m_ninePatchLayer->layer() : 0);
+    setContentsTo(m_ninePatchLayer ? m_ninePatchLayer->layer() : 0);
 }
 
 void GraphicsLayer::setContentsToCanvas(WebLayer* layer)

[jamesr, 2013/11/21 20:46:02]

i assume you'll remove these functions in a follow-up?

 {
-    setContentsTo(ContentsLayerForCanvas, layer);
+    setContentsTo(layer);
 }
 
 void GraphicsLayer::setContentsToMedia(WebLayer* layer)
 {
-    setContentsTo(ContentsLayerForVideo, layer);
+    setContentsTo(layer);
 }
 
 bool GraphicsLayer::addAnimation(PassOwnPtr<WebAnimation> popAnimation)
 {
     OwnPtr<WebAnimation> animation(popAnimation);
     ASSERT(animation);
     platformLayer()->setAnimationDelegate(this);
 
     // Remove any existing animations with the same animation id and target property.
     platformLayer()->removeAnimation(animation->id(), animation->targetProperty());
@@ skipping 173 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