Minor cleanup to RenderLayerCompositor::cacheAcceleratedCompositingFlags

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 133 matching lines @@
     notifyIFramesOfCompositingChange();
 }
 
 void RenderLayerCompositor::cacheAcceleratedCompositingFlags()
 {
     bool hasAcceleratedCompositing = false;
     bool showRepaintCounter = false;
     bool forceCompositingMode = false;
 
     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 (settings->acceleratedCompositingEnabled()) {
             m_compositingReasonFinder.updateTriggers();
             hasAcceleratedCompositing = m_compositingReasonFinder.hasTriggers();
         }
 
         showRepaintCounter = settings->showRepaintCounter();
         forceCompositingMode = settings->forceCompositingMode() && hasAcceleratedCompositing;
 
         if (forceCompositingMode && !isMainFrame())
             forceCompositingMode = m_compositingReasonFinder.requiresCompositingForScrollableFrame();
     }
@@ skipping 1529 matching lines @@
     } else if (graphicsLayer == m_scrollLayer.get()) {
         name = "LocalFrame Scrolling Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace WebCore