Remove unused cruft from GraphicsLayer

Source/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 64 matching lines @@
 
 PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerFactory* factory, GraphicsLayerClient* client)
 {
     return factory->createGraphicsLayer(client);
 }
 
 GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
     : m_client(client)
     , m_backgroundColor(Color::transparent)
     , m_opacity(1)
-    , m_zPosition(0)
     , m_blendMode(blink::WebBlendModeNormal)
     , m_hasTransformOrigin(false)
     , m_contentsOpaque(false)
     , m_shouldFlattenTransform(true)
     , m_backfaceVisibility(true)
     , m_masksToBounds(false)
     , m_drawsContent(false)
     , m_contentsVisible(true)
     , m_isRootForIsolatedGroup(false)
     , m_hasScrollParent(false)
     , m_hasClipParent(false)
     , 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_scrollableArea(0)
     , m_3dRenderingContext(0)
@@ skipping 33 matching lines @@
     resetTrackedRepaints();
     ASSERT(!m_parent);
 }
 
 void GraphicsLayer::setParent(GraphicsLayer* layer)
 {
     ASSERT(!layer || !layer->hasAncestor(this));
     m_parent = layer;
 }
 
+#if ASSERT_ENABLED
+
 bool GraphicsLayer::hasAncestor(GraphicsLayer* ancestor) const
 {
     for (GraphicsLayer* curr = parent(); curr; curr = curr->parent()) {
         if (curr == ancestor)
             return true;
     }
 
     return false;
 }
 
+#endif
+
 bool GraphicsLayer::setChildren(const GraphicsLayerVector& newChildren)
 {
     // If the contents of the arrays are the same, nothing to do.
     if (newChildren == m_children)
         return false;
 
     removeAllChildren();
 
     size_t listSize = newChildren.size();
     for (size_t i = 0; i < listSize; ++i)
@@ skipping 156 matching lines @@
 }
 
 void GraphicsLayer::paintGraphicsLayerContents(GraphicsContext& context, const IntRect& clip)
 {
     if (!m_client)
         return;
     incrementPaintCount();
     m_client->paintContents(this, context, m_paintingPhase, clip);
 }
 
-void GraphicsLayer::setZPosition(float position)
-{
-    m_zPosition = position;
-}
-
 void GraphicsLayer::updateChildList()
 {
     WebLayer* childHost = m_layer->layer();
     childHost->removeAllChildren();
 
     clearContentsLayerIfUnregistered();
 
     if (m_contentsLayer) {
         // FIXME: add the contents layer in the correct order with negative z-order children.
         // This does not cause visible rendering issues because currently contents layers are only used
@@ skipping 327 matching lines @@
             ts << repaintRectsCopy[i].x() << " ";
             ts << repaintRectsCopy[i].y() << " ";
             ts << repaintRectsCopy[i].width() << " ";
             ts << repaintRectsCopy[i].height();
             ts << ")\n";
         }
         writeIndent(ts, indent + 1);
         ts << ")\n";
     }
 
-    if ((flags & LayerTreeIncludesPaintingPhases) && paintingPhase()) {
+    if ((flags & LayerTreeIncludesPaintingPhases) && m_paintingPhase) {
         writeIndent(ts, indent + 1);
         ts << "(paintingPhases\n";
-        if (paintingPhase() & GraphicsLayerPaintBackground) {
+        if (m_paintingPhase & GraphicsLayerPaintBackground) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintBackground\n";
         }
-        if (paintingPhase() & GraphicsLayerPaintForeground) {
+        if (m_paintingPhase & GraphicsLayerPaintForeground) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintForeground\n";
         }
-        if (paintingPhase() & GraphicsLayerPaintMask) {
+        if (m_paintingPhase & GraphicsLayerPaintMask) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintMask\n";
         }
-        if (paintingPhase() & GraphicsLayerPaintChildClippingMask) {
+        if (m_paintingPhase & GraphicsLayerPaintChildClippingMask) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintChildClippingMask\n";
         }
-        if (paintingPhase() & GraphicsLayerPaintOverflowContents) {
+        if (m_paintingPhase & GraphicsLayerPaintOverflowContents) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintOverflowContents\n";
         }
-        if (paintingPhase() & GraphicsLayerPaintCompositedScroll) {
+        if (m_paintingPhase & GraphicsLayerPaintCompositedScroll) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintCompositedScroll\n";
         }
         writeIndent(ts, indent + 1);
         ts << ")\n";
     }
 
     if (flags & LayerTreeIncludesClipAndScrollParents) {
         if (m_hasScrollParent) {
             writeIndent(ts, indent + 1);
@@ skipping 240 matching lines @@
     if (m_isRootForIsolatedGroup == isolated)
         return;
     m_isRootForIsolatedGroup = isolated;
     platformLayer()->setIsRootForIsolatedGroup(isolated);
 }
 
 void GraphicsLayer::setContentsNeedsDisplay()
 {
     if (WebLayer* contentsLayer = contentsLayerIfRegistered()) {
         contentsLayer->invalidate();
-        addRepaintRect(contentsRect());
+        addRepaintRect(m_contentsRect);
     }
 }
 
 void GraphicsLayer::setNeedsDisplay()
 {
     if (drawsContent()) {
         m_layer->layer()->invalidate();
         addRepaintRect(FloatRect(FloatPoint(), m_size));
         for (size_t i = 0; i < m_linkHighlights.size(); ++i)
             m_linkHighlights[i]->invalidate();
@@ skipping 247 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