From 65dc080c8a86e00b665cf79e25c88e945e4be3ea Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Wed, 2 Nov 2005 00:00:20 +0000 Subject: [PATCH] Don't try to reframe generated content for image state changes on it. Bug 313656, r=biesi, sr=dbaron git-svn-id: svn://10.0.0.236/trunk@183369 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsGenConImageContent.cpp | 1 + mozilla/layout/base/nsCSSFrameConstructor.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mozilla/content/base/src/nsGenConImageContent.cpp b/mozilla/content/base/src/nsGenConImageContent.cpp index f6ae4503f3d..a78ee78e170 100644 --- a/mozilla/content/base/src/nsGenConImageContent.cpp +++ b/mozilla/content/base/src/nsGenConImageContent.cpp @@ -101,5 +101,6 @@ nsGenConImageContent::IntrinsicState() const imageState |= NS_EVENT_STATE_SUPPRESSED; imageState &= ~NS_EVENT_STATE_BROKEN; } + imageState &= ~NS_EVENT_STATE_LOADING; return state | imageState; } diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 5dfc8c5c788..b3ea0c4c31d 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -10614,8 +10614,10 @@ nsCSSFrameConstructor::DoContentStateChanged(nsIContent* aContent, // call will handle things. nsIFrame* primaryFrame = mPresShell->GetPrimaryFrameFor(aContent); if (primaryFrame) { - if (aStateMask & (NS_EVENT_STATE_BROKEN | NS_EVENT_STATE_USERDISABLED | - NS_EVENT_STATE_SUPPRESSED | NS_EVENT_STATE_LOADING)) { + // If it's generated content, ignore LOADING/etc state changes on it. + if (!primaryFrame->IsGeneratedContentFrame() && + (aStateMask & (NS_EVENT_STATE_BROKEN | NS_EVENT_STATE_USERDISABLED | + NS_EVENT_STATE_SUPPRESSED | NS_EVENT_STATE_LOADING))) { hint = nsChangeHint_ReconstructFrame; } else { PRUint8 app = primaryFrame->GetStyleDisplay()->mAppearance;