Move RenderLayerCompositor trigger caching to be when settings change

Source/core/frame/FrameView.cpp

Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index e4b516cfe5339a4d857ed7f6b7ca924a3046f6ec..0af087825fa983f9fd8e634a9d2c4aba86aa9563 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -606,6 +606,12 @@ void FrameView::calculateScrollbarModesForLayoutAndSetViewportRenderer(Scrollbar
     }
 }
 
+void FrameView::updateAcceleratedCompositingSettings()
+{
+    if (RenderView* renderView = this->renderView())
+        renderView->compositor()->updateAcceleratedCompositingSettings();
+}
+
 void FrameView::updateCompositingLayersAfterStyleChange()
 {
     TRACE_EVENT0("webkit", "FrameView::updateCompositingLayersAfterStyleChange");
@@ -621,9 +627,6 @@ void FrameView::updateCompositingLayersAfterStyleChange()
     // https://code.google.com/p/chromium/issues/detail?id=343756
     DisableCompositingQueryAsserts disabler;
 
-    // This call will make sure the cached hasAcceleratedCompositing is updated from the pref
-    renderView->compositor()->cacheAcceleratedCompositingFlags();
-
     // Sometimes we will change a property (for example, z-index) that will not
     // cause a layout, but will require us to update compositing state. We only
     // need to do this if a layout is not already scheduled.
@@ -644,8 +647,7 @@ void FrameView::updateCompositingLayersAfterLayout()
     // https://code.google.com/p/chromium/issues/detail?id=343756
     DisableCompositingQueryAsserts disabler;
 
-    // This call will make sure the cached hasAcceleratedCompositing is updated from the pref
-    renderView->compositor()->cacheAcceleratedCompositingFlags();
+    renderView->compositor()->updateForceCompositingMode();
     renderView->compositor()->updateCompositingRequirementsState();
     renderView->compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterLayout);
 }