| Index: Source/core/paint/CompositingRecorder.cpp
|
| diff --git a/Source/core/paint/CompositingRecorder.cpp b/Source/core/paint/CompositingRecorder.cpp
|
| index 874e65c4bd87074ab22d9929c3a63b1231bea5b5..ebd063a10c918b8a2cecf1357209a3c7d5b17295 100644
|
| --- a/Source/core/paint/CompositingRecorder.cpp
|
| +++ b/Source/core/paint/CompositingRecorder.cpp
|
| @@ -27,31 +27,36 @@ CompositingRecorder::~CompositingRecorder()
|
|
|
| void CompositingRecorder::beginCompositing(GraphicsContext& graphicsContext, const DisplayItemClientWrapper& client, const SkXfermode::Mode xferMode, const float opacity, const FloatRect* bounds, ColorFilter colorFilter)
|
| {
|
| - if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
|
| - ASSERT(graphicsContext.displayItemList());
|
| - if (graphicsContext.displayItemList()->displayItemConstructionIsDisabled())
|
| - return;
|
| - graphicsContext.displayItemList()->add(BeginCompositingDisplayItem::create(client, xferMode, opacity, bounds, colorFilter));
|
| - } else {
|
| - BeginCompositingDisplayItem beginCompositingDisplayItem(client, xferMode, opacity, bounds, colorFilter);
|
| - beginCompositingDisplayItem.replay(graphicsContext);
|
| - }
|
| + ALLOW_UNUSED_LOCAL(graphicsContext);
|
| + ALLOW_UNUSED_LOCAL(client);
|
| + ALLOW_UNUSED_LOCAL(opacity);
|
| + ALLOW_UNUSED_LOCAL(bounds);
|
| + ALLOW_UNUSED_LOCAL(colorFilter);
|
| + //if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
|
| + // ASSERT(graphicsContext.displayItemList());
|
| + // if (graphicsContext.displayItemList()->displayItemConstructionIsDisabled())
|
| + // return;
|
| + // graphicsContext.displayItemList()->add(BeginCompositingDisplayItem::create(client, xferMode, opacity, bounds, colorFilter));
|
| + //} else {
|
| + // BeginCompositingDisplayItem beginCompositingDisplayItem(client, xferMode, opacity, bounds, colorFilter);
|
| + // beginCompositingDisplayItem.replay(graphicsContext);
|
| + //}
|
| }
|
|
|
| void CompositingRecorder::endCompositing(GraphicsContext& graphicsContext, const DisplayItemClientWrapper& client)
|
| {
|
| - if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
|
| - ASSERT(graphicsContext.displayItemList());
|
| - if (!graphicsContext.displayItemList()->displayItemConstructionIsDisabled()) {
|
| - if (graphicsContext.displayItemList()->lastDisplayItemIsNoopBegin())
|
| - graphicsContext.displayItemList()->removeLastDisplayItem();
|
| - else
|
| - graphicsContext.displayItemList()->add(EndCompositingDisplayItem::create(client));
|
| - }
|
| - } else {
|
| - EndCompositingDisplayItem endCompositingDisplayItem(client);
|
| - endCompositingDisplayItem.replay(graphicsContext);
|
| - }
|
| + //if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
|
| + // ASSERT(graphicsContext.displayItemList());
|
| + // if (!graphicsContext.displayItemList()->displayItemConstructionIsDisabled()) {
|
| + // if (graphicsContext.displayItemList()->lastDisplayItemIsNoopBegin())
|
| + // graphicsContext.displayItemList()->removeLastDisplayItem();
|
| + // else
|
| + // graphicsContext.displayItemList()->add(EndCompositingDisplayItem::create(client));
|
| + // }
|
| + //} else {
|
| + // EndCompositingDisplayItem endCompositingDisplayItem(client);
|
| + // endCompositingDisplayItem.replay(graphicsContext);
|
| + //}
|
| }
|
|
|
| } // namespace blink
|
|
|