Move RenderLayerCompositor trigger caching to be when settings change

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 3710 matching lines @@
 {
     if (isAcceleratedCompositingActive()) {
         ASSERT(m_layerTreeView);
         m_layerTreeView->setNeedsAnimate();
         return;
     }
     if (m_client)
         m_client->scheduleAnimation();
 }
 
+void WebViewImpl::setCompositorCreationFailed(bool failed)
+{
+    m_compositorCreationFailed = failed;
+    // ChromeClientImpl::allowedCompositingTriggers reads this bit, so we need
+    // to update the composting triggers.
+    m_page->updateAcceleratedCompositingSettings();
+}
+
 void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
 {
     blink::Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
 
     if (m_isAcceleratedCompositingActive == active)
         return;
 
     if (!active) {
         m_isAcceleratedCompositingActive = false;
         // We need to finish all GL rendering before sending didDeactivateCompositor() to prevent
@@ skipping 33 matching lines @@
             updateLayerTreeBackgroundColor();
             m_layerTreeView->setHasTransparentBackground(isTransparent());
 #if USE(RUBBER_BANDING)
             RefPtr<Image> overhangImage = OverscrollTheme::theme()->getOverhangImage();
             if (overhangImage)
                 m_layerTreeView->setOverhangBitmap(overhangImage->nativeImageForCurrentFrame()->bitmap());
 #endif
             updateLayerTreeViewport();
             m_client->didActivateCompositor();
             m_isAcceleratedCompositingActive = true;
-            m_compositorCreationFailed = false;
+            setCompositorCreationFailed(false);
             if (m_pageOverlays)
                 m_pageOverlays->update();
             m_layerTreeView->setShowFPSCounter(m_showFPSCounter);
             m_layerTreeView->setShowPaintRects(m_showPaintRects);
             m_layerTreeView->setShowDebugBorders(m_showDebugBorders);
             m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEnabled);
             m_layerTreeView->setShowScrollBottleneckRects(m_showScrollBottleneckRects);
         } else {
             m_isAcceleratedCompositingActive = false;
             m_client->didDeactivateCompositor();
-            m_compositorCreationFailed = true;
+            setCompositorCreationFailed(true);
         }
     }
     if (page())
         page()->mainFrame()->view()->setClipsRepaints(!m_isAcceleratedCompositingActive);
 }
 
 void WebViewImpl::updateMainFrameScrollPosition(const IntPoint& scrollPosition, bool programmaticScroll)
 {
     FrameView* frameView = page()->mainFrame()->view();
     if (!frameView)
@@ skipping 39 matching lines @@
         WebPoint scrollPoint(scrollOffset.width, scrollOffset.height);
         setPageScaleFactor(pageScaleFactor() * pageScaleDelta, scrollPoint);
         m_doubleTapZoomPending = false;
     }
 }
 
 void WebViewImpl::didExitCompositingMode()
 {
     ASSERT(m_isAcceleratedCompositingActive);
     setIsAcceleratedCompositingActive(false);
-    m_compositorCreationFailed = true;
+    setCompositorCreationFailed(true);
     m_client->didInvalidateRect(IntRect(0, 0, m_size.width, m_size.height));
 
     // Force a style recalc to remove all the composited layers.
     m_page->mainFrame()->document()->setNeedsStyleRecalc(SubtreeStyleChange);
 
     if (m_pageOverlays)
         m_pageOverlays->update();
 }
 
 void WebViewImpl::updateLayerTreeViewport()
@@ skipping 133 matching lines @@
     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefinedConstraints();
 
     if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         return false;
 
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 } // namespace blink