Remove some code now that forceCompositingMode is gone.

Source/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 209 matching lines @@
 }
 
 bool RenderLayerCompositor::acceleratedCompositingForOverflowScrollEnabled() const
 {
     return m_compositingReasonFinder.hasOverflowScrollTrigger();
 }
 
 void RenderLayerCompositor::setCompositingLayersNeedRebuild()
 {
     // FIXME: crbug.com/332248 ideally this could be merged with setNeedsCompositingUpdate().
-    // FIXME: We can remove the staleInCompositingMode check once we get rid of the
-    // forceCompositingMode setting.
-    if (staleInCompositingMode())

[ojan, 2014/06/05 03:32:21]

Honestly, I can't remember why this was blocked on removing
forceCompositingMode. It caused some crazy codepath that shouldn't be possible
to happen. In either case, blocking setting this dirty bit on this stale value
doesn't make any sense.

-        m_compositingLayersNeedRebuild = true;
+    m_compositingLayersNeedRebuild = true;
     page()->animator().scheduleVisualUpdate();
     lifecycle().ensureStateAtMost(DocumentLifecycle::LayoutClean);
 }
 
 static RenderVideo* findFullscreenVideoRenderer(Document& document)
 {
     Element* fullscreenElement = FullscreenElementStack::fullscreenElementFrom(document);
     while (fullscreenElement && fullscreenElement->isFrameOwnerElement()) {
         Document* contentDocument = toHTMLFrameOwnerElement(fullscreenElement)->contentDocument();
         if (!contentDocument)
@@ skipping 220 matching lines @@
 {
     bool compositedLayerMappingChanged = false;
     bool nonCompositedReasonChanged = updateLayerIfViewportConstrained(layer);
 
     // 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) {
     case AllocateOwnCompositedLayerMapping:
         ASSERT(!layer->hasCompositedLayerMapping());
-        {
-            // FIXME: This can go away once we get rid of the forceCompositingMode setting.
-            // It's needed because setCompositingModeEnabled call ensureRootLayer, which
-            // eventually calls WebViewImpl::enterForceCompositingMode.
-            DeprecatedDirtyCompositingDuringCompositingUpdate marker(lifecycle());
-            setCompositingModeEnabled(true);
-        }
+        setCompositingModeEnabled(true);
 
         // If this layer was previously squashed, we need to remove its reference to a groupedMapping right away, so
         // that computing repaint rects will know the layer's correct compositingState.
         // FIXME: do we need to also remove the layer from it's location in the squashing list of its groupedMapping?
         // Need to create a test where a squashed layer pops into compositing. And also to cover all other
         // sorts of compositingState transitions.
         layer->setLostGroupedMapping(false);
         layer->setGroupedMapping(0);
 
         // If we need to repaint, do so before allocating the compositedLayerMapping
@@ skipping 884 matching lines @@
     } else if (graphicsLayer == m_scrollLayer.get()) {
         name = "LocalFrame Scrolling Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace WebCore