author | Robert Longson <longsonr> |
Tue, 03 Apr 2018 10:54:00 +0300 | |
changeset 412583 | a4eedcfdca50df0a63a50ae150ab59aa5c8dabeb |
parent 412582 | 1a13549c696a08ac5a37c2a6b1dc73b9c0ad77d8 |
child 412584 | de33fb39fa4878714120d06ce6a0c72179016be9 |
push id | 33809 |
push user | rgurzau@mozilla.com |
push date | Tue, 10 Apr 2018 16:54:59 +0000 |
treeherder | mozilla-central@0a2dae2d8cf9 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jmuizelaar |
bugs | 1451066 |
milestone | 61.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
gfx/2d/DrawEventRecorder.cpp | file | annotate | diff | comparison | revisions | |
gfx/2d/DrawEventRecorder.h | file | annotate | diff | comparison | revisions |
--- a/gfx/2d/DrawEventRecorder.cpp +++ b/gfx/2d/DrawEventRecorder.cpp @@ -92,20 +92,20 @@ void DrawEventRecorderMemory::Flush() { } void DrawEventRecorderMemory::FlushItem(IntRect aRect) { MOZ_RELEASE_ASSERT(!aRect.IsEmpty()); - // Detatching our existing resources will add some + // Detaching our existing resources will add some // destruction events to our stream so we need to do that // first. - DetatchResources(); + DetachResources(); // See moz2d_renderer.rs for a description of the stream format WriteElement(mIndex, mOutputStream.mLength); // write out the fonts into the extra data section mSerializeCallback(mOutputStream, mUnscaledFonts); WriteElement(mIndex, mOutputStream.mLength);
--- a/gfx/2d/DrawEventRecorder.h +++ b/gfx/2d/DrawEventRecorder.h @@ -25,17 +25,17 @@ class DrawEventRecorderPrivate : public { public: MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawEventRecorderPrivate, override) DrawEventRecorderPrivate(); virtual ~DrawEventRecorderPrivate() { } virtual bool Finish() override { ClearResources(); return true; } virtual void FlushItem(IntRect) { } - void DetatchResources() { + void DetachResources() { // The iteration is a bit awkward here because our iterator will // be invalidated by the removal for (auto font = mStoredFonts.begin(); font != mStoredFonts.end(); ) { auto oldFont = font++; (*oldFont)->RemoveUserData(reinterpret_cast<UserDataKey*>(this)); } for (auto surface = mStoredSurfaces.begin(); surface != mStoredSurfaces.end(); ) { auto oldSurface = surface++;