Remove ENABLE(COMPOSITOR).

sky/engine/core/rendering/compositing/RenderLayerCompositor.cpp

 /*
  * Copyright (C) 2009, 2010 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 97 matching lines @@
     if (rootShouldAlwaysComposite()) {
         // FIXME: Is this needed? It was added in https://bugs.webkit.org/show_bug.cgi?id=26651.
         // No tests fail if it's deleted.
         setNeedsCompositingUpdate(CompositingUpdateRebuildTree);
         setCompositingModeEnabled(true);
     }
 }
 
 bool RenderLayerCompositor::rootShouldAlwaysComposite() const
 {
-#if ENABLE(COMPOSITOR)
-    return true;
-#else
     return false;
-#endif
 }
 
 void RenderLayerCompositor::updateAcceleratedCompositingSettings()
 {
     m_compositingReasonFinder.updateTriggers();
     m_rootShouldAlwaysCompositeDirty = true;
 }
 
 bool RenderLayerCompositor::hasAcceleratedCompositing() const
 {
-#if ENABLE(COMPOSITOR)
-    return true;
-#else
     return false;
-#endif
 }
 
 bool RenderLayerCompositor::layerSquashingEnabled() const
 {
     if (!RuntimeEnabledFeatures::layerSquashingEnabled())
         return false;
     return true;
 }
 
 bool RenderLayerCompositor::preferCompositingToLCDTextEnabled() const
@@ skipping 63 matching lines @@
     if (updateType >= CompositingUpdateAfterCompositingInputChange)
         CompositingInputsUpdater(rootRenderLayer()).update();
 
 #if ENABLE(ASSERT)
     CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(rootRenderLayer());
 #endif
 }
 
 void RenderLayerCompositor::updateIfNeeded()
 {
-    CompositingUpdateType updateType = m_pendingUpdateType;
     m_pendingUpdateType = CompositingUpdateNone;
-
-    if (!hasAcceleratedCompositing()) {
-#if ENABLE(COMPOSITOR)
-        updateWithoutAcceleratedCompositing(updateType);
-#endif
-        return;
-    }
-
-    if (updateType == CompositingUpdateNone)
-        return;
-
-    RenderLayer* updateRoot = rootRenderLayer();
-
-    Vector<RenderLayer*> layersNeedingPaintInvalidation;
-
-    if (updateType >= CompositingUpdateAfterCompositingInputChange) {
-        CompositingInputsUpdater(updateRoot).update();
-
-#if ENABLE(ASSERT)
-        // FIXME: Move this check to the end of the compositing update.
-        CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(updateRoot);
-#endif
-
-        CompositingRequirementsUpdater(m_renderView, m_compositingReasonFinder).update(updateRoot);
-
-        CompositingLayerAssigner layerAssigner(this);
-        layerAssigner.assign(updateRoot, layersNeedingPaintInvalidation);
-
-        bool layersChanged = layerAssigner.layersChanged();
-
-        {
-            TRACE_EVENT0("blink", "RenderLayerCompositor::updateAfterCompositingChange");
-            if (const FrameView::ScrollableAreaSet* scrollableAreas = m_renderView.frameView()->scrollableAreas()) {
-                for (FrameView::ScrollableAreaSet::iterator it = scrollableAreas->begin(); it != scrollableAreas->end(); ++it)
-                    layersChanged |= (*it)->updateAfterCompositingChange();
-            }
-        }
-
-        if (layersChanged)
-            updateType = std::max(updateType, CompositingUpdateRebuildTree);
-    }
-
-    if (updateType != CompositingUpdateNone) {
-        GraphicsLayerUpdater updater;
-        updater.update(*updateRoot, layersNeedingPaintInvalidation);
-
-        if (updater.needsRebuildTree())
-            updateType = std::max(updateType, CompositingUpdateRebuildTree);
-
-#if ENABLE(ASSERT)
-        // FIXME: Move this check to the end of the compositing update.
-        GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(*updateRoot);
-#endif
-    }
-
-    if (updateType >= CompositingUpdateRebuildTree) {
-        GraphicsLayerTreeBuilder::AncestorInfo ancestorInfo;
-        GraphicsLayerVector childList;
-        ancestorInfo.childLayersOfEnclosingCompositedLayer = &childList;
-        {
-            TRACE_EVENT0("blink", "GraphicsLayerTreeBuilder::rebuild");
-            GraphicsLayerTreeBuilder().rebuild(*updateRoot, ancestorInfo);
-        }
-
-        if (childList.isEmpty())
-            destroyRootLayer();
-        else
-            m_rootContentLayer->setChildren(childList);
-    }
-
-    if (m_needsUpdateFixedBackground) {
-        rootFixedBackgroundsChanged();
-        m_needsUpdateFixedBackground = false;
-    }
-
-    for (unsigned i = 0; i < layersNeedingPaintInvalidation.size(); i++) {
-        RenderLayer* layer = layersNeedingPaintInvalidation[i];
-        layer->paintInvalidator().computePaintInvalidationRectsIncludingNonCompositingDescendants();
-
-        paintInvalidationOnCompositingChange(layer);
-    }
 }
 
 bool RenderLayerCompositor::allocateOrClearCompositedLayerMapping(RenderLayer* layer, const CompositingStateTransitionType compositedLayerUpdate)
 {
     bool compositedLayerMappingChanged = false;
 
     // FIXME: It would be nice to directly use the layer's compositing reason,
     // but allocateOrClearCompositedLayerMapping also gets called without having updated compositing
     // requirements fully.
     switch (compositedLayerUpdate) {
@@ skipping 459 matching lines @@
     } else if (graphicsLayer == m_scrollLayer.get()) {
         name = "LocalFrame Scrolling Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink