diff -r 000000000000 -r 6474c204b198 gfx/skia/trunk/src/gpu/GrAtlas.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/skia/trunk/src/gpu/GrAtlas.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,114 @@
+
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAtlas_DEFINED
+#define GrAtlas_DEFINED
+
+
+#include "GrPoint.h"
+#include "GrTexture.h"
+#include "GrDrawTarget.h"
+
+class GrGpu;
+class GrRectanizer;
+class GrAtlasMgr;
+class GrAtlas;
+
+// The backing GrTexture for a set of GrAtlases is broken into a spatial grid of GrPlots. When
+// a GrAtlas needs space on the texture, it requests a GrPlot. Each GrAtlas can claim one
+// or more GrPlots. The GrPlots keep track of subimage placement via their GrRectanizer. Once a
+// GrPlot is "full" (i.e. there is no room for the new subimage according to the GrRectanizer), the
+// GrAtlas can request a new GrPlot via GrAtlasMgr::addToAtlas().
+//
+// If all GrPlots are allocated, the replacement strategy is up to the client. The drawToken is
+// available to ensure that all draw calls are finished for that particular GrPlot.
+// GrAtlasMgr::removeUnusedPlots() will free up any finished plots for a given GrAtlas.
+
+class GrPlot {
+public:
+    SK_DECLARE_INTERNAL_LLIST_INTERFACE(GrPlot);
+
+    int getOffsetX() const { return fOffset.fX; }
+    int getOffsetY() const { return fOffset.fY; }
+
+    GrTexture* texture() const { return fTexture; }
+
+    bool addSubImage(int width, int height, const void*, GrIPoint16*);
+
+    GrDrawTarget::DrawToken drawToken() const { return fDrawToken; }
+    void setDrawToken(GrDrawTarget::DrawToken draw) { fDrawToken = draw; }
+
+    void resetRects();
+
+private:
+    GrPlot();
+    ~GrPlot(); // does not try to delete the fNext field
+
+    // for recycling
+    GrDrawTarget::DrawToken fDrawToken;
+
+    GrTexture*              fTexture;
+    GrRectanizer*           fRects;
+    GrAtlasMgr*             fAtlasMgr;
+    GrIPoint16              fOffset;
+    size_t                  fBytesPerPixel;
+
+    friend class GrAtlasMgr;
+};
+
+typedef SkTInternalLList<GrPlot> GrPlotList;
+
+class GrAtlasMgr {
+public:
+    GrAtlasMgr(GrGpu*, GrPixelConfig);
+    ~GrAtlasMgr();
+
+    // add subimage of width, height dimensions to atlas
+    // returns the containing GrPlot and location relative to the backing texture
+    GrPlot* addToAtlas(GrAtlas*, int width, int height, const void*, GrIPoint16*);
+
+    // remove reference to this plot
+    bool removePlot(GrAtlas* atlas, const GrPlot* plot);
+
+    // get a plot that's not being used by the current draw
+    // this allows us to overwrite this plot without flushing
+    GrPlot* getUnusedPlot();
+
+    GrTexture* getTexture() const {
+        return fTexture;
+    }
+
+private:
+    void moveToHead(GrPlot* plot);
+
+    GrGpu*        fGpu;
+    GrPixelConfig fPixelConfig;
+    GrTexture*    fTexture;
+
+    // allocated array of GrPlots
+    GrPlot*       fPlotArray;
+    // LRU list of GrPlots
+    GrPlotList    fPlotList;
+};
+
+class GrAtlas {
+public:
+    GrAtlas() { }
+    ~GrAtlas() { }
+
+    bool isEmpty() { return 0 == fPlots.count(); }
+
+    SkISize getSize() const;
+
+private:
+    SkTDArray<GrPlot*> fPlots;
+
+    friend class GrAtlasMgr;
+};
+
+#endif