Refactoring ImageBuffer to decouple it from Canvas2DLayerBridge

Source/core/platform/DragImage.cpp

 /*
  * Copyright (C) 2007 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 23 matching lines @@
 #include "core/platform/graphics/ImageBuffer.h"
 #include "core/platform/graphics/StringTruncator.h"
 #include "core/platform/graphics/skia/NativeImageSkia.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontMetrics.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/TextRun.h"
+#include "platform/graphics/UnacceleratedImageBufferSurface.h"
 #include "platform/transforms/AffineTransform.h"
 #include "platform/weborigin/KURL.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/WTFString.h"
 
 #include <algorithm>
@@ skipping 102 matching lines @@
             imageSize.setWidth(kMaxDragLabelWidth);
             clipURLString = true;
         } else
             imageSize.setWidth(std::max(labelSize.width(), urlStringSize.width()) + kDragLabelBorderX * 2);
     }
 
     // We now know how big the image needs to be, so we create and
     // fill the background
     IntSize scaledImageSize = imageSize;
     scaledImageSize.scale(deviceScaleFactor);
-    OwnPtr<ImageBuffer> buffer(ImageBuffer::create(scaledImageSize, deviceScaleFactor));
-    if (!buffer)
+    OwnPtr<ImageBufferSurface> surface = adoptPtr(new UnacceleratedImageBufferSurface(scaledImageSize, NonOpaque, deviceScaleFactor));
+    if (!surface->isValid())

[Stephen White, 2013/12/04 21:18:40]

Same here.

         return nullptr;
+    ImageBuffer buffer(surface.release());
 
     const float DragLabelRadius = 5;
     const IntSize radii(DragLabelRadius, DragLabelRadius);
     IntRect rect(IntPoint(), imageSize);
     const Color backgroundColor(140, 140, 140);
-    buffer->context()->fillRoundedRect(rect, radii, radii, radii, radii, backgroundColor);
+    buffer.context()->fillRoundedRect(rect, radii, radii, radii, radii, backgroundColor);
 
     // Draw the text
     if (drawURLString) {
         if (clipURLString)
             urlString = StringTruncator::centerTruncate(urlString, imageSize.width() - (kDragLabelBorderX * 2.0f), urlFont, StringTruncator::EnableRoundingHacks);
         IntPoint textPos(kDragLabelBorderX, imageSize.height() - (kLabelBorderYOffset + urlFont.fontMetrics().descent()));
         TextRun textRun(urlString);
-        buffer->context()->drawText(urlFont, TextRunPaintInfo(textRun), textPos);
+        buffer.context()->drawText(urlFont, TextRunPaintInfo(textRun), textPos);
     }
 
     if (clipLabelString)
         label = StringTruncator::rightTruncate(label, imageSize.width() - (kDragLabelBorderX * 2.0f), labelFont, StringTruncator::EnableRoundingHacks);
 
     IntPoint textPos(kDragLabelBorderX, kDragLabelBorderY + labelFont.pixelSize());
     TextRun textRun(label);
-    buffer->context()->drawText(urlFont, TextRunPaintInfo(textRun), textPos);
+    buffer.context()->drawText(urlFont, TextRunPaintInfo(textRun), textPos);
 
-    RefPtr<Image> image = buffer->copyImage();
+    RefPtr<Image> image = buffer.copyImage();
     return DragImage::create(image.get());
 }
 
 DragImage::DragImage(const SkBitmap& bitmap, float resolutionScale)
     : m_bitmap(bitmap)
     , m_resolutionScale(resolutionScale)
 {
 }
 
 DragImage::~DragImage()
@@ skipping 54 matching lines @@
             *pixel = SkPreMultiplyARGB(
                 SkColorGetA(*pixel) * fraction,
                 SkColorGetR(*pixel),
                 SkColorGetG(*pixel),
                 SkColorGetB(*pixel));
         }
     }
 }
 
 } // namespace WebCore