mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-14 04:03:47 +00:00
Bug 564993. Part 1: Remove CopyFrom API, it won't be used. r=Bas
This commit is contained in:
parent
262fd13c52
commit
962d37b89b
@ -364,20 +364,6 @@ public:
|
||||
*/
|
||||
virtual void EndDrawing() = 0;
|
||||
|
||||
/**
|
||||
* DRAWING PHASE ONLY
|
||||
* Copy the aRegion contents from aSource into this layer, offsetting
|
||||
* them by aDelta. The validity is also copied, so invalid areas in
|
||||
* aSource will make corresponding areas of this layer invalid. You
|
||||
* must not call this after BeginDrawing/EndDrawing on this layer.
|
||||
*
|
||||
* aSource must be this layer or a layer after this layer in a
|
||||
* preorder traversal of the layer tree.
|
||||
*/
|
||||
virtual void CopyFrom(ThebesLayer* aSource,
|
||||
const nsIntRegion& aRegion,
|
||||
const nsIntPoint& aDelta) = 0;
|
||||
|
||||
protected:
|
||||
ThebesLayer(LayerManager* aManager, void* aImplData)
|
||||
: Layer(aManager, aImplData) {}
|
||||
|
@ -239,9 +239,6 @@ public:
|
||||
|
||||
virtual gfxContext* BeginDrawing(nsIntRegion* aRegionToDraw);
|
||||
virtual void EndDrawing();
|
||||
virtual void CopyFrom(ThebesLayer* aSource,
|
||||
const nsIntRegion& aRegion,
|
||||
const nsIntPoint& aDelta);
|
||||
|
||||
protected:
|
||||
BasicLayerManager* BasicManager()
|
||||
@ -276,22 +273,6 @@ BasicThebesLayer::EndDrawing()
|
||||
"Not currently drawing this layer");
|
||||
}
|
||||
|
||||
void
|
||||
BasicThebesLayer::CopyFrom(ThebesLayer* aSource,
|
||||
const nsIntRegion& aRegion,
|
||||
const nsIntPoint& aDelta)
|
||||
{
|
||||
NS_ASSERTION(!BasicManager()->IsBeforeInTree(aSource, this),
|
||||
"aSource must not be before this layer in tree");
|
||||
NS_ASSERTION(BasicManager()->IsBeforeInTree(BasicManager()->GetLastPainted(), this),
|
||||
"Cannot copy into a layer already painted");
|
||||
NS_ASSERTION(BasicManager()->InDrawing(),
|
||||
"Can only draw in drawing phase");
|
||||
// Nothing to do here since we have no retained buffers. Our
|
||||
// valid region is empty (since we haven't painted this layer yet),
|
||||
// so no need to mark anything invalid.
|
||||
}
|
||||
|
||||
class BasicImageLayer : public ImageLayer, BasicImplData {
|
||||
public:
|
||||
BasicImageLayer(BasicLayerManager* aLayerManager) :
|
||||
|
@ -218,14 +218,6 @@ ThebesLayerOGL::EndDrawing()
|
||||
mContext = NULL;
|
||||
}
|
||||
|
||||
void
|
||||
ThebesLayerOGL::CopyFrom(ThebesLayer* aSource,
|
||||
const nsIntRegion& aRegion,
|
||||
const nsIntPoint& aDelta)
|
||||
{
|
||||
// XXX - Roc says this is going away in the API. Ignore it for now.
|
||||
}
|
||||
|
||||
LayerOGL::LayerType
|
||||
ThebesLayerOGL::GetType()
|
||||
{
|
||||
|
@ -63,10 +63,6 @@ public:
|
||||
|
||||
void EndDrawing();
|
||||
|
||||
void CopyFrom(ThebesLayer* aSource,
|
||||
const nsIntRegion& aRegion,
|
||||
const nsIntPoint& aDelta);
|
||||
|
||||
/** LayerOGL implementation */
|
||||
LayerType GetType();
|
||||
Layer* GetLayer();
|
||||
|
Loading…
x
Reference in New Issue
Block a user