Remove m_hasBlendMode from BeginTransparencyDisplayItem

Source/core/paint/LayerPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/LayerPainter.h"
 
 #include "core/frame/Settings.h"
 #include "core/page/Page.h"
 #include "core/paint/FilterPainter.h"
@@ skipping 88 matching lines @@
         }
 
         paintLayerByApplyingTransform(context, paintingInfo, paintFlags);
 
         return;
     }
 
     paintLayerContentsAndReflection(context, paintingInfo, paintFlags);
 }
 
+static inline WebBlendMode blendModeForRenderer(const RenderObject& renderer)
+{
+    // RenderObject::hasBlendMode is gated on RuntimeEnabledFeatures::cssCompositingEnabled,
+    // otherwise the true-clause alone would suffice.
+    return renderer.hasBlendMode() ? renderer.style()->blendMode() : WebBlendModeNormal;

[Julien - ping for review, 2014/11/19 19:16:05]

RenderStyle::blendMode() is gated on cssCompositingEnabled too so you could just
use it directly and remove this function.

[chrishtr, 2014/11/19 19:24:09]

Let's get rid of all of the hasBlendMode() methods, and rename
WebBlendModeNormal to WebBlendModeNone.

[fs, 2014/11/20 09:09:46]

Ah, but of course... Thanks, fixed.

+}
+
 class TransparencyLayerHelper {
 public:
     TransparencyLayerHelper(GraphicsContext* context, RenderLayer& renderLayer, const RenderLayer* rootLayer, const LayoutRect& paintDirtyRect, const LayoutSize& subPixelAccumulation, PaintBehavior paintBehavior)
         : m_transparencyLayerInProgress(false)
         , m_context(context)
         , m_renderLayer(renderLayer)
     {
         // Blending operations must be performed only with the nearest ancestor stacking context.
         // Note that there is no need to create a transparency layer if we're painting the root.
         // FIXME: this should be unified further into RenderLayer::paintsWithTransparency().
         bool shouldUseTransparencyLayerForBlendMode = !renderLayer.renderer()->isDocumentElement() && renderLayer.stackingNode()->isStackingContext() && renderLayer.hasNonIsolatedDescendantWithBlendMode();
         if (!shouldUseTransparencyLayerForBlendMode && !renderLayer.paintsWithTransparency(paintBehavior))
             return;
 
         OwnPtr<BeginTransparencyDisplayItem> beginTransparencyDisplayItem = adoptPtr(new BeginTransparencyDisplayItem(
             renderLayer.renderer(), DisplayItem::BeginTransparency, renderLayer.paintingExtent(rootLayer, paintDirtyRect, subPixelAccumulation, paintBehavior),
-            renderLayer.renderer()->hasBlendMode(), renderLayer.renderer()->style()->blendMode(), renderLayer.renderer()->opacity()));
+            blendModeForRenderer(*renderLayer.renderer()), renderLayer.renderer()->opacity()));
         if (RuntimeEnabledFeatures::slimmingPaintEnabled())
             renderLayer.renderer()->view()->viewDisplayList().add(beginTransparencyDisplayItem.release());
         else
             beginTransparencyDisplayItem->replay(context);
 
         m_transparencyLayerInProgress = true;
     }
 
     ~TransparencyLayerHelper()
     {
@@ skipping 618 matching lines @@
 
         OwnPtr<ClipRecorder> clipRecorder;
         if (needsToClip(paintingInfo, clipRect))
             clipRecorder = adoptPtr(new ClipRecorder(m_renderLayer.renderer(), context, DisplayItem::ClipLayerFragmentParent, clipRect, &paintingInfo, LayoutPoint(), paintFlags));
 
         paintLayerByApplyingTransform(context, paintingInfo, paintFlags, fragment.paginationOffset);
     }
 }
 
 } // namespace blink