Refactor GraphicsLayer::setContentsToImage().

Source/core/platform/graphics/GraphicsLayer.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. 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
@@ skipping 63 matching lines @@
 protected:
     virtual ~LinkHighlightClient() { }
 };
 
 // GraphicsLayer is an abstraction for a rendering surface with backing store,
 // which may have associated transformation and animations.
 
 class GraphicsLayer : public GraphicsContextPainter, public blink::WebAnimationDelegate, public blink::WebLayerScrollClient, public blink::WebLayerClient {
     WTF_MAKE_NONCOPYABLE(GraphicsLayer); WTF_MAKE_FAST_ALLOCATED;
 public:
-    enum ContentsLayerPurpose {
-        NoContentsLayer = 0,
-        ContentsLayerForImage,
-        ContentsLayerForNinePatch,
-        ContentsLayerForVideo,
-        ContentsLayerForCanvas,
-    };
-
     static PassOwnPtr<GraphicsLayer> create(GraphicsLayerFactory*, GraphicsLayerClient*);
 
     virtual ~GraphicsLayer();
 
     GraphicsLayerClient* client() const { return m_client; }
 
     // blink::WebLayerClient implementation.
     virtual blink::WebString debugName(blink::WebLayer*) OVERRIDE;
 
     void setCompositingReasons(blink::WebCompositingReasons);
@@ skipping 233 matching lines @@
     int incrementPaintCount() { return ++m_paintCount; }
 
     void dumpProperties(TextStream&, int indent, LayerTreeFlags) const;
     void dumpAdditionalProperties(TextStream&, int /*indent*/, LayerTreeFlags) const { }
 
     // Helper functions used by settors to keep layer's the state consistent.
     void updateChildList();
     void updateLayerIsDrawable();
     void updateContentsRect();
 
-    void setContentsTo(ContentsLayerPurpose, blink::WebLayer*);
+    void setContentsTo(blink::WebLayer*);
     void setupContentsLayer(blink::WebLayer*);
     void clearContentsLayerIfUnregistered();
     blink::WebLayer* contentsLayerIfRegistered();
 
     GraphicsLayerClient* m_client;
 
     // Offset from the owning renderer
     IntSize m_offsetFromRenderer;
 
     // Position is relative to the parent GraphicsLayer
@@ skipping 46 matching lines @@
     // We don't have ownership of m_contentsLayer, but we do want to know if a given layer is the
     // same as our current layer in setContentsTo(). Since m_contentsLayer may be deleted at this point,
     // we stash an ID away when we know m_contentsLayer is alive and use that for comparisons from that point
     // on.
     int m_contentsLayerId;
 
     Vector<LinkHighlightClient*> m_linkHighlights;
 
     OwnPtr<OpaqueRectTrackingContentLayerDelegate> m_opaqueRectTrackingContentLayerDelegate;
 
-    ContentsLayerPurpose m_contentsLayerPurpose;
-
     ScrollableArea* m_scrollableArea;
     blink::WebCompositingReasons m_compositingReasons;
 };
 
 
 } // namespace WebCore
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer);
 #endif
 
 #endif // GraphicsLayer_h