wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1251150. Back out crash annotations used to try to diagnose crash. a=ritu

Browse Source 
They didn't find any problems.

MozReview-Commit-ID: 1Oj3EoXGDlz
This commit is contained in:
Timothy Nikkel 2016-04-20 17:13:13 -05:00
parent e9820b4ca2
commit 390adb0262
3 changed files with 4 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/2d/Logging.h
View File

@ -545,7 +545,6 @@ typedef Log<LOG_CRITICAL, CriticalLogger> CriticalLog;
// while the critical error is
// gfxCriticalError() << "Something to report and assert";
#define gfxCriticalNote gfxCriticalError(gfxCriticalError::DefaultOptions(false))
#define gfxCriticalNoteOnce static gfxCriticalError GFX_LOGGING_GLUE(sOnceAtLine,__LINE__) = gfxCriticalNote
// The "once" versions will only trigger the first time through. You can do this:
// gfxCriticalErrorOnce() << "This message only shows up once;

92
layout/base/nsPresShell.cpp
View File

@ -1170,18 +1170,10 @@ PresShell::Destroy()
mSynthMouseMoveEvent.Revoke();
if (mInImageVisibility) {
gfxCriticalNoteOnce << "Destroy is re-entering on "
<< (NS_IsMainThread() ? "" : "non-") << "main thread";
}
mInImageVisibility = true;
mUpdateImageVisibilityEvent.Revoke();
ClearVisibleImagesList(nsIImageLoadingContent::ON_NONVISIBLE_REQUEST_DISCARD);
mInImageVisibility = false;
if (mCaret) {
mCaret->Terminate();
mCaret = nullptr;
@ -5548,54 +5540,11 @@ PresShell::MarkImagesInListVisible(const nsDisplayList& aList)
}
}
void
PresShell::ReportAnyBadState()
{
if (!NS_IsMainThread()) {
gfxCriticalNote << "Got null image in image visibility: off-main-thread";
}
if (mIsZombie) {
gfxCriticalNote << "Got null image in image visibility: mIsZombie";
}
if (mIsDestroying) {
gfxCriticalNote << "Got null image in image visibility: mIsDestroying";
}
if (mIsReflowing) {
gfxCriticalNote << "Got null image in image visibility: mIsReflowing";
}
if (mPaintingIsFrozen) {
gfxCriticalNote << "Got null image in image visibility: mPaintingIsFrozen";
}
if (mForwardingContainer) {
gfxCriticalNote << "Got null image in image visibility: mForwardingContainer";
}
if (mIsNeverPainting) {
gfxCriticalNote << "Got null image in image visibility: mIsNeverPainting";
}
if (mIsDocumentGone) {
gfxCriticalNote << "Got null image in image visibility: mIsDocumentGone";
}
if (!nsContentUtils::IsSafeToRunScript()) {
gfxCriticalNote << "Got null image in image visibility: not safe to run script";
}
}
void
PresShell::SetInImageVisibility(bool aState)
{
mInImageVisibility = aState;
}
static void
DecrementVisibleCount(nsTHashtable<nsRefPtrHashKey<nsIImageLoadingContent>>& aImages,
uint32_t aNonvisibleAction, PresShell* aPresShell)
uint32_t aNonvisibleAction)
{
for (auto iter = aImages.Iter(); !iter.Done(); iter.Next()) {
if (MOZ_UNLIKELY(!iter.Get()->GetKey())) {
// We are about to crash, annotate crash report with some info that might
// help debug the crash (bug 1251150)
aPresShell->ReportAnyBadState();
}
iter.Get()->GetKey()->DecrementVisibleCount(aNonvisibleAction);
}
}
@ -5611,7 +5560,7 @@ PresShell::RebuildImageVisibilityDisplayList(const nsDisplayList& aList)
mVisibleImages.SwapElements(oldVisibleImages);
MarkImagesInListVisible(aList);
DecrementVisibleCount(oldVisibleImages,
nsIImageLoadingContent::ON_NONVISIBLE_NO_ACTION, this);
nsIImageLoadingContent::ON_NONVISIBLE_NO_ACTION);
}
/* static */ void
@ -5634,7 +5583,7 @@ PresShell::ClearImageVisibilityVisited(nsView* aView, bool aClear)
void
PresShell::ClearVisibleImagesList(uint32_t aNonvisibleAction)
{
DecrementVisibleCount(mVisibleImages, aNonvisibleAction, this);
DecrementVisibleCount(mVisibleImages, aNonvisibleAction);
mVisibleImages.Clear();
}
@ -5751,7 +5700,7 @@ PresShell::RebuildImageVisibility(nsRect* aRect,
MarkImagesInSubtreeVisible(rootFrame, vis, aRemoveOnly);
DecrementVisibleCount(oldVisibleImages,
nsIImageLoadingContent::ON_NONVISIBLE_NO_ACTION, this);
nsIImageLoadingContent::ON_NONVISIBLE_NO_ACTION);
}
void
@ -5768,14 +5717,7 @@ PresShell::DoUpdateImageVisibility(bool aRemoveOnly)
mUpdateImageVisibilityEvent.Revoke();
if (mInImageVisibility) {
gfxCriticalNoteOnce << "DoUpdateImageVisibility is re-entering on "
<< (NS_IsMainThread() ? "" : "non-") << "main thread";
}
mInImageVisibility = true;
if (mHaveShutDown || mIsDestroying) {
mInImageVisibility = false;
return;
}
@ -5784,15 +5726,12 @@ PresShell::DoUpdateImageVisibility(bool aRemoveOnly)
if (!rootFrame) {
ClearVisibleImagesList(
nsIImageLoadingContent::ON_NONVISIBLE_REQUEST_DISCARD);
mInImageVisibility = false;
return;
}
RebuildImageVisibility(/* aRect = */ nullptr, aRemoveOnly);
ClearImageVisibilityVisited(rootFrame->GetView(), true);
mInImageVisibility = false;
#ifdef DEBUG_IMAGE_VISIBILITY_DISPLAY_LIST
// This can be used to debug the frame walker by comparing beforeImageList and
// mVisibleImages in RebuildImageVisibilityDisplayList to see if they produce
@ -5902,18 +5841,10 @@ PresShell::EnsureImageInVisibleList(nsIImageLoadingContent* aImage)
}
#endif
if (mInImageVisibility) {
gfxCriticalNoteOnce << "EnsureImageInVisibleList is re-entering on "
<< (NS_IsMainThread() ? "" : "non-") << "main thread";
}
mInImageVisibility = true;
if (!mVisibleImages.Contains(aImage)) {
mVisibleImages.PutEntry(aImage);
aImage->IncrementVisibleCount();
}
mInImageVisibility = false;
}
void
@ -5933,12 +5864,6 @@ PresShell::RemoveImageFromVisibleList(nsIImageLoadingContent* aImage)
return;
}
if (mInImageVisibility) {
gfxCriticalNoteOnce << "RemoveImageFromVisibleList is re-entering on "
<< (NS_IsMainThread() ? "" : "non-") << "main thread";
}
mInImageVisibility = true;
uint32_t count = mVisibleImages.Count();
mVisibleImages.RemoveEntry(aImage);
if (mVisibleImages.Count() < count) {
@ -5946,8 +5871,6 @@ PresShell::RemoveImageFromVisibleList(nsIImageLoadingContent* aImage)
aImage->DecrementVisibleCount(
nsIImageLoadingContent::ON_NONVISIBLE_NO_ACTION);
}
mInImageVisibility = false;
}
class nsAutoNotifyDidPaint
@ -10702,12 +10625,6 @@ PresShell::UpdateImageLockingState()
nsresult rv = mDocument->SetImageLockingState(locked);
if (locked) {
if (mInImageVisibility) {
gfxCriticalNoteOnce << "UpdateImageLockingState is re-entering on "
<< (NS_IsMainThread() ? "" : "non-") << "main thread";
}
mInImageVisibility = true;
// Request decodes for visible images; we want to start decoding as
// quickly as possible when we get foregrounded to minimize flashing.
for (auto iter = mVisibleImages.Iter(); !iter.Done(); iter.Next()) {
@ -10717,7 +10634,6 @@ PresShell::UpdateImageLockingState()
imageFrame->MaybeDecodeForPredictedSize();
}
}
mInImageVisibility = false;
}
return rv;

6
layout/base/nsPresShell.h
View File

@ -392,10 +392,6 @@ public:
void SetNextPaintCompressed() { mNextPaintCompressed = true; }
void ReportAnyBadState();
void SetInImageVisibility(bool aState);
protected:
virtual ~PresShell();
@ -887,8 +883,6 @@ protected:
// Whether the widget has received a paint message yet.
bool mHasReceivedPaintMessage : 1;
bool mInImageVisibility : 1;
static bool sDisableNonTestMouseEvents;
};