Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1464032 Part 4: Record DrawTarget::Flush and DrawTarget::DetachAllSnapshots. r=jrmuizel

Browse Source
This commit is contained in:
Bob Owen 2018-12-02 14:14:11 +00:00
parent b6f83f9fbb
commit 7d566c46fe
4 changed files with 95 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/2d/DrawTargetRecording.cpp
View File

@ -368,7 +368,13 @@ already_AddRefed<SourceSurface> DrawTargetRecording::IntoLuminanceSource(
return retSurf.forget();
}
void DrawTargetRecording::DetachAllSnapshots() {}
void DrawTargetRecording::Flush() {
mRecorder->RecordEvent(RecordedFlush(this));
}
void DrawTargetRecording::DetachAllSnapshots() {
mRecorder->RecordEvent(RecordedDetachAllSnapshots(this));
}
void DrawTargetRecording::DrawSurface(SourceSurface* aSurface,
const Rect& aDest, const Rect& aSource,

6
gfx/2d/DrawTargetRecording.h
View File

@ -37,11 +37,7 @@ class DrawTargetRecording : public DrawTarget {
virtual IntSize GetSize() const override { return mSize; }
/* Ensure that the DrawTarget backend has flushed all drawing operations to
* this draw target. This must be called before using the backing surface of
* this draw target outside of GFX 2D code.
*/
virtual void Flush() override { mFinalDT->Flush(); }
virtual void Flush() override;
virtual void FlushItem(const IntRect& aBounds) override;

5
gfx/2d/RecordedEvent.h
View File

@ -250,9 +250,10 @@ class RecordedEvent {
UNSCALEDFONTDESTRUCTION,
INTOLUMINANCE,
EXTERNALSURFACECREATION,
FLUSH,
DETACHALLSNAPSHOTS,
LAST,
};
static const uint32_t kTotalEventTypes =
RecordedEvent::FILTERNODESETINPUT + 1;
virtual ~RecordedEvent() = default;

85
gfx/2d/RecordedEventImpl.h
View File

@ -1079,6 +1079,48 @@ class RecordedGradientStopsDestruction
MOZ_IMPLICIT RecordedGradientStopsDestruction(S& aStream);
};
class RecordedFlush : public RecordedDrawingEvent<RecordedFlush> {
public:
explicit RecordedFlush(DrawTarget* aDT) : RecordedDrawingEvent(FLUSH, aDT) {}
bool PlayEvent(Translator* aTranslator) const final;
template <class S>
void Record(S& aStream) const;
virtual void OutputSimpleEventInfo(
std::stringstream& aStringStream) const override;
virtual std::string GetName() const override { return "Flush"; }
private:
friend class RecordedEvent;
template <class S>
MOZ_IMPLICIT RecordedFlush(S& aStream);
};
class RecordedDetachAllSnapshots
: public RecordedDrawingEvent<RecordedDetachAllSnapshots> {
public:
explicit RecordedDetachAllSnapshots(DrawTarget* aDT)
: RecordedDrawingEvent(DETACHALLSNAPSHOTS, aDT) {}
bool PlayEvent(Translator* aTranslator) const final;
template <class S>
void Record(S& aStream) const;
virtual void OutputSimpleEventInfo(
std::stringstream& aStringStream) const override;
virtual std::string GetName() const override { return "DetachAllSnapshots"; }
private:
friend class RecordedEvent;
template <class S>
MOZ_IMPLICIT RecordedDetachAllSnapshots(S& aStream);
};
class RecordedSnapshot : public RecordedEventDerived<RecordedSnapshot> {
public:
RecordedSnapshot(ReferencePtr aRefPtr, DrawTarget* aDT)
@ -3014,6 +3056,45 @@ inline void RecordedIntoLuminanceSource::OutputSimpleEventInfo(
<< ")";
}
inline bool RecordedFlush::PlayEvent(Translator* aTranslator) const {
aTranslator->LookupDrawTarget(mDT)->Flush();
return true;
}
template <class S>
void RecordedFlush::Record(S& aStream) const {
RecordedDrawingEvent::Record(aStream);
}
template <class S>
RecordedFlush::RecordedFlush(S& aStream)
: RecordedDrawingEvent(FLUSH, aStream) {}
inline void RecordedFlush::OutputSimpleEventInfo(
std::stringstream& aStringStream) const {
aStringStream << "[" << mDT << "] Flush";
}
inline bool RecordedDetachAllSnapshots::PlayEvent(
Translator* aTranslator) const {
aTranslator->LookupDrawTarget(mDT)->DetachAllSnapshots();
return true;
}
template <class S>
void RecordedDetachAllSnapshots::Record(S& aStream) const {
RecordedDrawingEvent::Record(aStream);
}
template <class S>
RecordedDetachAllSnapshots::RecordedDetachAllSnapshots(S& aStream)
: RecordedDrawingEvent(DETACHALLSNAPSHOTS, aStream) {}
inline void RecordedDetachAllSnapshots::OutputSimpleEventInfo(
std::stringstream& aStringStream) const {
aStringStream << "[" << mDT << "] DetachAllSnapshots";
}
inline bool RecordedSnapshot::PlayEvent(Translator* aTranslator) const {
RefPtr<SourceSurface> src = aTranslator->LookupDrawTarget(mDT)->Snapshot();
aTranslator->AddSourceSurface(mRefPtr, src);
@ -3500,7 +3581,9 @@ inline void RecordedFilterNodeSetInput::OutputSimpleEventInfo(
f(UNSCALEDFONTCREATION, RecordedUnscaledFontCreation); \
f(UNSCALEDFONTDESTRUCTION, RecordedUnscaledFontDestruction); \
f(INTOLUMINANCE, RecordedIntoLuminanceSource); \
f(EXTERNALSURFACECREATION, RecordedExternalSurfaceCreation);
f(EXTERNALSURFACECREATION, RecordedExternalSurfaceCreation); \
f(FLUSH, RecordedFlush); \
f(DETACHALLSNAPSHOTS, RecordedDetachAllSnapshots);
#define DO_WITH_EVENT_TYPE(_typeenum, _class) \
case _typeenum: { \