Initial implementation of display list backed 2D canvases

Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google 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
@@ skipping 137 matching lines @@
         ASSERT(!m_paintStateIndex);
         ASSERT(!m_paintState->saveCount());
         ASSERT(!m_annotationCount);
         ASSERT(!m_layerCount);
         ASSERT(m_recordingStateStack.isEmpty());
         ASSERT(m_canvasStateStack.isEmpty());
     }
 #endif
 }
 
+void GraphicsContext::resetCanvas(SkCanvas* canvas)
+{
+    ASSERT(canvas);
+    m_canvas = canvas;
+    m_opaqueRegion.reset();
+}
+
 void GraphicsContext::save()
 {
     if (contextDisabled())
         return;
 
     m_paintState->incrementSaveCount();
 
     m_canvasStateStack.append(CanvasSaveState(m_pendingCanvasSave, m_canvas->getSaveCount()));
     m_pendingCanvasSave = true;
 }
@@ skipping 870 matching lines @@
 
 void GraphicsContext::drawImageBuffer(ImageBuffer* image, const FloatRect& dest,
     const FloatRect* src, CompositeOperator op)
 {
     if (contextDisabled() || !image)
         return;
 
     image->draw(this, dest, src, op);
 }
 
+void GraphicsContext::drawPicture(PassRefPtr<SkPicture> picture, const FloatRect& dest, const FloatRect& src, CompositeOperator op, WebBlendMode blendMode)
+{
+    if (contextDisabled() || !picture)
+        return;
+
+    SkPaint picturePaint;
+    picturePaint.setXfermode(WebCoreCompositeToSkiaComposite(op, blendMode).get());
+    SkRect skBounds = WebCoreFloatRectToSKRect(dest);
+    saveLayer(&skBounds, &picturePaint);
+    SkMatrix pictureTransform;
+    pictureTransform.setRectToRect(WebCoreFloatRectToSKRect(src), skBounds, SkMatrix::kFill_ScaleToFit);
+    m_canvas->concat(pictureTransform);
+    picture->draw(m_canvas);
+    restoreLayer();
+}
+
 void GraphicsContext::writePixels(const SkImageInfo& info, const void* pixels, size_t rowBytes, int x, int y)
 {
     if (contextDisabled())
         return;
 
     m_canvas->writePixels(info, pixels, rowBytes, x, y);
 
     if (m_trackOpaqueRegion) {
         SkRect rect = SkRect::MakeXYWH(x, y, info.width(), info.height());
         SkPaint paint;
@@ skipping 769 matching lines @@
 
 void GraphicsContext::didDrawTextInRect(const SkRect& textRect)
 {
     if (m_trackTextRegion) {
         TRACE_EVENT0("skia", "GraphicsContext::didDrawTextInRect");
         m_textRegion.join(textRect);
     }
 }
 
 }