Add a basic custom painting facility to Sky

sky/engine/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 80 matching lines @@
 } // unnamed namespace
 
 struct GraphicsContext::CanvasSaveState {
     CanvasSaveState(bool pendingSave, int count)
         : m_pendingSave(pendingSave), m_restoreCount(count) { }
 
     bool m_pendingSave;
     int m_restoreCount;
 };
 
-struct GraphicsContext::RecordingState {
-    RecordingState(SkCanvas* currentCanvas, const SkMatrix& currentMatrix, PassRefPtr<DisplayList> displayList)
-        : m_savedCanvas(currentCanvas)
-        , m_displayList(displayList)
-        , m_savedMatrix(currentMatrix)
-    {
-    }
-
-    SkCanvas* m_savedCanvas;
-    RefPtr<DisplayList> m_displayList;
-    const SkMatrix m_savedMatrix;
-};
-
 GraphicsContext::GraphicsContext(SkCanvas* canvas, DisabledMode disableContextOrPainting)
     : m_canvas(canvas)
     , m_paintStateStack()
     , m_paintStateIndex(0)
     , m_pendingCanvasSave(false)
 #if ENABLE(ASSERT)
     , m_layerCount(0)
     , m_disableDestructionChecks(false)
 #endif
     , m_disabledState(disableContextOrPainting)
@@ skipping 13 matching lines @@
     m_paintState = m_paintStateStack.last().get();
 }
 
 GraphicsContext::~GraphicsContext()
 {
 #if ENABLE(ASSERT)
     if (!m_disableDestructionChecks) {
         ASSERT(!m_paintStateIndex);
         ASSERT(!m_paintState->saveCount());
         ASSERT(!m_layerCount);
-        ASSERT(m_recordingStateStack.isEmpty());
         ASSERT(m_canvasStateStack.isEmpty());
     }
 #endif
 }
 
 void GraphicsContext::resetCanvas(SkCanvas* canvas)
 {
     ASSERT(canvas);
     m_canvas = canvas;
     m_trackedRegion.reset();
@@ skipping 167 matching lines @@
     SkRect skBounds = SkRect::Make(skIBounds);
     *bounds = FloatRect(skBounds);
     return true;
 }
 
 SkMatrix GraphicsContext::getTotalMatrix() const
 {
     if (contextDisabled())
         return SkMatrix::I();
 
-    if (!isRecording())
-        return m_canvas->getTotalMatrix();
-
-    const RecordingState& recordingState = m_recordingStateStack.last();
-    SkMatrix totalMatrix = recordingState.m_savedMatrix;
-    totalMatrix.preConcat(m_canvas->getTotalMatrix());
-
-    return totalMatrix;
+    return m_canvas->getTotalMatrix();
 }
 
 void GraphicsContext::adjustTextRenderMode(SkPaint* paint)
 {
     if (contextDisabled())
         return;
 
     if (!paint->isLCDRenderText())
         return;
 
@@ skipping 87 matching lines @@
         return;
 
     restoreLayer();
 
     ASSERT(m_layerCount > 0);
 #if ENABLE(ASSERT)
     --m_layerCount;
 #endif
 }
 
-void GraphicsContext::beginRecording(const FloatRect& bounds)
-{
-    RefPtr<DisplayList> displayList = adoptRef(new DisplayList(bounds));
-
-    SkCanvas* savedCanvas = m_canvas;
-    SkMatrix savedMatrix = getTotalMatrix();
-
-    if (!contextDisabled()) {
-        IntRect recordingRect = enclosingIntRect(bounds);
-        m_canvas = displayList->beginRecording(recordingRect.size());
-
-        // We want the bounds offset mapped to (0, 0), such that the display list content
-        // is fully contained within the SkPictureRecord's bounds.
-        if (!toFloatSize(bounds.location()).isZero()) {
-            m_canvas->translate(-bounds.x(), -bounds.y());
-            // To avoid applying the offset repeatedly in getTotalMatrix(), we pre-apply it here.
-            savedMatrix.preTranslate(bounds.x(), bounds.y());
-        }
-    }
-
-    m_recordingStateStack.append(RecordingState(savedCanvas, savedMatrix, displayList));
-}
-
-PassRefPtr<DisplayList> GraphicsContext::endRecording()
-{
-    ASSERT(!m_recordingStateStack.isEmpty());
-
-    RecordingState recording = m_recordingStateStack.last();
-    if (!contextDisabled()) {
-        ASSERT(recording.m_displayList->isRecording());
-        recording.m_displayList->endRecording();
-    }
-
-    m_recordingStateStack.removeLast();
-    m_canvas = recording.m_savedCanvas;
-
-    return recording.m_displayList.release();
-}
-
-bool GraphicsContext::isRecording() const
-{
-    return !m_recordingStateStack.isEmpty();
-}
-
-void GraphicsContext::drawDisplayList(DisplayList* displayList)
+void GraphicsContext::drawDisplayList(DisplayList* displayList, const FloatPoint& point)
 {
     ASSERT(displayList);
-    ASSERT(!displayList->isRecording());
 
-    if (contextDisabled() || displayList->bounds().isEmpty())
+    if (contextDisabled())
         return;
 
     realizeCanvasSave();
 
-    const FloatRect& bounds = displayList->bounds();
-    if (bounds.x() || bounds.y()) {
+    if (point.x() || point.y()) {
         SkMatrix m;
-        m.setTranslate(bounds.x(), bounds.y());
+        m.setTranslate(point.x(), point.y());
         m_canvas->drawPicture(displayList->picture(), &m, 0);
     } else {
         m_canvas->drawPicture(displayList->picture());
     }
 }
 
 void GraphicsContext::drawConvexPolygon(size_t numPoints, const FloatPoint* points, bool shouldAntialias)
 {
     if (contextDisabled())
         return;
@@ skipping 1270 matching lines @@
         // FIXME: This is to not break tests (it results in the filter bitmap flag
         // being set to true). We need to decide if we respect InterpolationNone
         // being returned from computeInterpolationQuality.
         resampling = InterpolationLow;
     }
     resampling = limitInterpolationQuality(this, resampling);
     paint->setFilterQuality(static_cast<SkFilterQuality>(resampling));
 }
 
 } // namespace blink