First version of new merge algorithm (not enabled yet)

Source/platform/graphics/paint/DrawingRecorder.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 "platform/graphics/paint/DrawingRecorder.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/CachedDisplayItem.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace blink {
 
 DrawingRecorder::DrawingRecorder(GraphicsContext* context, DisplayItemClient displayItemClient, DisplayItem::Type displayItemType, const FloatRect& bounds)
     : m_context(context)
     , m_displayItemClient(displayItemClient)
     , m_displayItemType(displayItemType)
-    , m_bounds(bounds)
     , m_canUseCachedDrawing(false)
 {
     if (!RuntimeEnabledFeatures::slimmingPaintEnabled())
         return;
 
     ASSERT(DisplayItem::isDrawingType(displayItemType));
 #if ENABLE(ASSERT)
     context->setInDrawingRecorder(true);
 #endif
     ASSERT(context->displayItemList());
@@ skipping 20 matching lines @@
 
     if (m_canUseCachedDrawing) {
 #if ENABLE(ASSERT)
         RefPtr<const SkPicture> picture = m_context->endRecording();
         ASSERT(!picture || !picture->approximateOpCount());
 #endif
         displayItem = CachedDisplayItem::create(m_displayItemClient, DisplayItem::drawingTypeToCachedType(m_displayItemType));
     } else {
         RefPtr<const SkPicture> picture = m_context->endRecording();
         if (!picture || !picture->approximateOpCount())
-            displayItem = DisplayItem::create(m_displayItemClient, m_displayItemType);
-        else
-            displayItem = DrawingDisplayItem::create(m_displayItemClient, m_displayItemType, picture);
+            return;
+        displayItem = DrawingDisplayItem::create(m_displayItemClient, m_displayItemType, picture);
     }
 
 #ifndef NDEBUG
     displayItem->setClientDebugString(m_clientDebugString);
 #endif
 
     m_context->displayItemList()->add(displayItem.release());
 }
 
 #ifndef NDEBUG
 void DrawingRecorder::setClientDebugString(const WTF::String& clientDebugString)
 {
     m_clientDebugString = clientDebugString;
 }
 #endif
 
 } // namespace blink