Move RenderLayerCompositor trigger caching to be when settings change

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 104 matching lines @@
     , m_hasAcceleratedCompositing(true)
     , m_showRepaintCounter(false)
     , m_needsToRecomputeCompositingRequirements(false)
     , m_compositing(false)
     , m_compositingLayersNeedRebuild(false)
     , m_forceCompositingMode(false)
     , m_needsUpdateCompositingRequirementsState(false)
     , m_isTrackingRepaints(false)
     , m_rootLayerAttachment(RootLayerUnattached)
 {
+    updateAcceleratedCompositingSettings();
 }
 
 RenderLayerCompositor::~RenderLayerCompositor()
 {
     ASSERT(m_rootLayerAttachment == RootLayerUnattached);
 }
 
 void RenderLayerCompositor::enableCompositingMode(bool enable)
 {
     if (enable == m_compositing)
         return;
 
     m_compositing = enable;
 
     if (m_compositing)
         ensureRootLayer();
     else
         destroyRootLayer();
 
     notifyIFramesOfCompositingChange();
 }
 
-void RenderLayerCompositor::cacheAcceleratedCompositingFlags()
+void RenderLayerCompositor::updateForceCompositingMode()
+{
+    // FIXME: Can settings really be null here?
+    if (Settings* settings = m_renderView.document().settings()) {
+        bool forceCompositingMode = settings->forceCompositingMode() && m_hasAcceleratedCompositing;
+        if (forceCompositingMode && !isMainFrame())
+            forceCompositingMode = m_compositingReasonFinder.requiresCompositingForScrollableFrame();
+        if (forceCompositingMode != m_forceCompositingMode) {
+            setCompositingLayersNeedRebuild();
+            m_forceCompositingMode = forceCompositingMode;
+        }
+    }
+}
+
+void RenderLayerCompositor::updateAcceleratedCompositingSettings()
 {
     bool hasAcceleratedCompositing = false;
     bool showRepaintCounter = false;
-    bool forceCompositingMode = false;
 
+    // FIXME: Can settings really be null here?
     if (Settings* settings = m_renderView.document().settings()) {
         hasAcceleratedCompositing = settings->acceleratedCompositingEnabled();
 
         // We allow the chrome to override the settings, in case the page is rendered
         // on a chrome that doesn't allow accelerated compositing.
         if (hasAcceleratedCompositing) {
             if (page()) {
                 m_compositingReasonFinder.updateTriggers();
                 hasAcceleratedCompositing = m_compositingReasonFinder.hasTriggers();
             }
         }
 
         showRepaintCounter = settings->showRepaintCounter();
-        forceCompositingMode = settings->forceCompositingMode() && hasAcceleratedCompositing;
-
-        if (forceCompositingMode && !isMainFrame())
-            forceCompositingMode = m_compositingReasonFinder.requiresCompositingForScrollableFrame();
     }
 
-    if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showRepaintCounter != m_showRepaintCounter || forceCompositingMode != m_forceCompositingMode)
+    if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showRepaintCounter != m_showRepaintCounter)
         setCompositingLayersNeedRebuild();
 
     m_hasAcceleratedCompositing = hasAcceleratedCompositing;
     m_showRepaintCounter = showRepaintCounter;
-    m_forceCompositingMode = forceCompositingMode;
+
+    updateForceCompositingMode();
 }
 
 bool RenderLayerCompositor::layerSquashingEnabled() const
 {
     if (RuntimeEnabledFeatures::bleedingEdgeFastPathsEnabled())
         return true;
     if (Settings* settings = m_renderView.document().settings())
         return settings->layerSquashingEnabled();
 
     return false;
@@ skipping 1512 matching lines @@
     } else if (graphicsLayer == m_scrollLayer.get()) {
         name = "LocalFrame Scrolling Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace WebCore