mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1155371 - Include DOMMediaStream and MediaSource object URLs in memory reports. r=khuey (b62513f5c6)
- Bug 1187782 (part 1) - Replace nsBaseHashtable::EnumerateRead() calls in dom/base/ with iterators. r=khuey. (aa14b536c4)
- Bug 1187782 (part 2) - Replace nsBaseHashtable::EnumerateRead() calls in dom/base/ with iterators. r=khuey. (1645a9b910)
- Bug 1187782 (part 3) - Replace nsBaseHashtable::EnumerateRead() calls in dom/base/ with iterators. r=khuey. (67a83f37d5)
- Bug 1187782 (part 4) - Replace nsBaseHashtable::EnumerateRead() calls in dom/base/ with iterators. r=khuey. (bf1f7a8dfe)
- Bug 1187782 (part 5) - Replace nsBaseHashtable::EnumerateRead() calls in dom/base/ with iterators. r=khuey. (b76f1f34c8)
- Bug 1187782 (part 6) - Replace nsBaseHashtable::EnumerateRead() calls in dom/base/ with iterators. r=khuey. (f44312f3a9)
- Bug 1187782 (part 7) - Replace nsBaseHashtable::EnumerateRead() calls in dom/base/ with iterators. r=khuey. (33bb281955)
- Bug 1187782 (part 8) - Replace nsBaseHashtable::EnumerateRead() calls in dom/base/ with iterators. r=khuey. (52f7bc040e)
- Bug 1187782 (part 9) - Replace nsBaseHashtable::EnumerateRead() calls in dom/base/ with iterators. r=khuey. (7e797025a3)
- Bug 1207355 (Part 1) - Stop requesting decodes in nsDocument. r=tn (b2e6eb49c0)
- Bug 1202085 - Part 1: Remove imgICache::RemoveEntry(); r=seth (b5e4e2242f)
- Bug 1202085 - Part 2: Add an optional document argument to imgICache::FindEntryProperties(); r=seth (3f3138e5ba)
- Bug 1202085 - Part 3: Relax the assertion in ServiceWorkerManager::IsControlled to only happen when we think the document is controlled; r=jdm (6a829a6985)
- Bug 1202085 - Part 4: Add an ID for controlled document to the image cache key; r=seth (525ca69231)
- Bug 1202085 - Part 5: Add an automated test for the interaction of image cache with controlled documents; r=jdm (627e28d58d)
- Bug 1202085 - Part 6: Clear the entries in the image cache belonging to a controlled document when it gets destroyed; r=seth (935b858eac)
- Bug 1221279 Don't crash while clearing imgLoader cache when disconnected document is destroyed. r=smaug (040d3fa2be)
- Bug 1207084 - keep sheet level on tokenstream for use in ruledata when resolving variables, to fix hcm issues with CSS variables, r=heycam (2d8f5af005)
- Bug 1207084 - addendum: fix operator== for nsCSSValueTokenStream, implied-r=heycam (ee66d21638)
- Bug 1209124 - Bail out of nsStyleSet::GatherRuleProcessors and PresShell::Observe if we're called during/after shutdown. r=dbaron (7043eb3ee7)
- Bug 1216043 - Rename nsStyleSheet::sheetType and make it an enum class. r=dbaron (f03c5328e6)
- Bug 1168158 - Make URLValue::mString a smart pointer. r=heycam (06e37619be)
- Bug 1216038 - Deduce underlying integer type for MakeEnumeratedRange starting at 0. r=froydnj (883c74fb6b)
- Bug 1216040 - Make ArrayLength support mozilla::EnumeratedArray. r=froydnj (d1fc4aa43c)
- Bug 1216041 - Add ranged iterator support to mozilla::{Array,RangedArray,EnumerationArray}. r=froydnj (bf71f0ea1f)
- Bug 1128787 part.1 Add test r=ehsan (97016bbd85)
- Bug 1128787 part.2 nsHTMLDocument should clear focus before making itself editable when designMode is enabled and it makes the focused content non-focusable r=smaug+enndeakin (eccab99994)
- Bug 1171342 - Store contenteditable.css and designmode.css in the style sheet cache. r=jwatt (7e6aa290d2)
- Bug 1164279 - Disable font-variant-east-asian: ruby for <rt> on Windows. r=jfkthame (04117062d7)
- Bug 1126230 part 9 - Remove fullscreen override and related test. r=dbaron (18818d67fa)
- Bug 1126230 part 1 - Use delegated constructor to simplify constructor of nsFrameConstructorState. r=bz (5c1193f9f5)
- Bug 1126230 part 2 - Refactor part of nsFrameConstructorState::AddChild. r=bz (3c02f9e8c2)
- Bug 1126230 part 3 - Add :-moz-browser-frame pseudo class for HTML browser frame elements. r=dbaron (6a7b01f092)
- Bug 1211040 - Restrict -moz-window-{dragging,shadow} to be chrome-only. r=dbaron (005f02f673)
- Bug 1126230 part 4 - Add -moz-top-layer internal CSS property and set it for fullscreen elements. r=dbaron (02d841cab7)
- Bug 1203405 - Ignore order of abs/fixed-pos frames in the frame list. r=roc (d67696d0ea)
- Bug 1126230 part 5 - Give proper geometric parent for top layer frames. r=bz,dbaron (19504f223e)
- Bug 1126230 part 6 - Add nsIDocument::GetFullscreenStack() method. r=smaug (d401d534d1)
- Bug 1126230 part 7 - Add static method nsDisplayListBuilder::GetOutOfFlowData(). r=roc (3bdafef9b2)
- Bug 1126230 part 8 - Implement painting part for the top layer. r=roc (8875115dc1)
- Bug 1126230 part 10 - Add test for fullscreen top layer. r=dbaron (d095d85cd0)
- Bug 1069192 part 1 - Force users of nsCSSProps::IsEnabled() to pass in the enabled state. r=dbaron (38e40ebf1d)
- Bug 1195978 - set line number when re-parsing sheet. r=heycam (41cdf15319)
- Bug 1202095 - re-use @imported style sheets from inIDOMUtils.parseStyleSheet. r=heycam (2f54fdacf0)
- Bug 1099557 followup - Put the default setting for control-character visibility behind a runtime pref, and keep it off-by-default on release builds for now. r=dbaron (3ada076d9b)
- Bug 1069192 part 2 - Add a flag for chrome-only properties and change semantics of enabling flags. r=dbaron (2e887397ac)
- Bug 1220496 - Create PresHint/StyleAttr rule processors in nsStyleSet::Init and make DirtyRuleProcessors private. r=bzbarsky (0b538fe7cc)
- No bug - Cleanup the layout/style mochitest manifest. (e26676496f)
- Bug 1183461 part 1 - Move InitialAdvance to CSSAnimation; r=heycam (dac91a759a)
- Bug 1183461 part 2 - Reorder the parameters to EventInfo constructors; r=heycam (29fc1b2096)
- Bug 1183461 part 3 - Add Animation::AnimationTimeToTimeStamp; r=heycam (d3410ccc01)
- Bug 1183461 part 4 - Add CSSAnimation::ElapsedTimeToTimeStamp; r=heycam (10bac42e8e)
- Bug 1183461 part 5 - Store event TimeStamp along with event info; r=heycam (0250a63ee8)
- Bug 1220599 - Fix erroneous nsHTMLDocument::Open comment to note that we reuse the document rather than creating a new one. r=baku (5d492865d3)
- Bug 1220827 - Replace question comment in nsHTMLDocument::Open with an explanatory comment to explain why we create a new Window. r=smaug (69f16ef5dc)
- missing bits of Bug 1170911 - Add pref for switching off execCommand("cut"/"copy"). r=ehsan (613644fa39)
- Bug 1183461 part 6 - Store the generating animation on the event; r=heycam (c490af70cc)
- Bug 1194037 part 4 - Remove ticking from FlushAnimations; r=dholbert (8df1f3eec4)
- Bug 1200568 - Don't create animations for elements that are not part of the document tree; r=dbaron (3027949d8b)
- Bug 1183461 part 7 - Add EventInfoComparator and sort events; r=heycam (550aad09bc)
- Bug 1183461 part 8 - Add tests for event order dispatch; r=heycam (964ee5fe23)
- Bug 978833 patch 1 - Add mochitest for bug 978833. r=heycam (4b4579d3f7)
- Bug 1208951 - Part 1: Split half of KeyframeValueEntry into a base class. r=birtles (32d7cbd477)
- Bug 1208951 - Part 2: Use a comparator object instead of operator< onKeyframeValueEntry. r=birtles (3b83723ef0)
- Bug 1209603 patch 1 - Add comments to RuleNodeCacheConditions.h . r=heycam (444eabdddc)
- Bug 1209603 patch 2 - Reduce calls to StyleVisibility() in WritingMode constructor. r=heycam (f079fb5765)
- Bug 1209603 patch 3 - Don't call SetFontSizeDependency for 0em. r=heycam (7a87fe5229)
- Bug 1209603 patch 4 - Add reftest for bug 1209603. r=heycam (1680144fc2)
- Bug 1209603 patch 5 - Move inline method nsStyleContext::GetCachedStyleData into header file, and make it public. r=heycam (32c38f790e)
- Bug 1209603 patch 6 - Prepare to use a different meaning of mBits when cached style data pointer is null. r=heycam (15e6471e58)
- Bug 1209603 patch 7 - Add assertions that we don't ask the rule node for data when we have cached data on the style context. r=heycam (0f27687446)
- Bug 1209603 patch 8 - Record in mBits when we have gotten a reset style struct that is cached on the rule node. r=heycam (b5e693a986)
- Bug 1209603 patch 9 - Cache inherited style structs on the style context when we found already-cached data in the rule tree. r=heycam (bfa6a169cb)
- Bug 1209603 patch 10 - Make PeekStyle* exact, i.e., guaranteed to return null if we haven't computed the data for this context. r=heycam (6ffdf7f0bf)
- Bug 1209603 patch 11 - Assert that PeekStyle* results don't change during difference computation. r=heycam (a3d7336dce)
- Bug 1193518 - Ensure that when we update a WritingMode after resolving dir=auto, we set the inline-dir bit appropriately as well as the inline-bidi bit. r=dholbert (072c062ddc)
- Bug 1216431 patch 1 - Give WritingMode an nsStyleVisibility* constructor. r=heycam (b7efb1204c)
- Bug 1216431 patch 2 - Pass nsStyleVisibility to nsStylePosition::CalcDifference to avoid computing new nsStyleVisibility during nsStyleContext::CalcStyleDifference. r=heycam (b842123d9b)
- Bug 1216431 patch 3 - Cache structs that are stored with conditions on the rule node all the time, rather than only when freshly computed. r=heycam (d4ea9adc19)
- Bug 1216431 patch 4 - Don't trigger computation of new structs via testing of conditions for conditionally-stored structs on the rule node. r=heycam (95cc7e8a52)
- Bug 1216431 patch 5 - Back out half of bug 1209603 patch 10. r=heycam (5949a2e9d0)
- Bug 1216431 patch 6 - Back out bug 1209603 patch 8. r=heycam (45a05ad60e)
- Bug 1209603 patch 6b - Rename nsStyleContext::HasCachedInheritedStyleData to HasCachedDependentStyleData. r=heycam (c4f52f00d0)
- Bug 1216431 patch 7 - Back out bug 1209603 patch 6. r=heycam (6eb8677af2)
- Bug 1216431 patch 8 - Fix whitespace error I made when addressing review comments. (19abf29215)
- Bug 1214958 - Add operators &=, |=, and ^= to mozilla::DebugOnly. r=froydnj (c76229e817)
- Bug 1208951 - Part 3: Expose nsCSSValue -> nsTimingFunction computation function. r=birtles (f0124bbbf2)
- Bug 1208951 - Part 4: Add an nsCSSParser entry point to parse a single longhand property and return an nsCSSValue. r=birtles (a317aa3255)
- Bug 1208951 - Part 5: Add nsCSSProps method to look a property by its IDL name. r=bzbarsky (1d0b78374d)
- Bug 1208951 - Part 6: Add method to compare nsCSSPropertySets for equality. r=birtles (9039197290)
- Bug 1208951 - Part 7: Add a StyleAnimationValue::ComputeValues method to compute components of a shorthand. r=birtles (36149d8c82)
- Bug 1208951 - Part 8: Don't warn if StyleAnimationValue::ComputeValue fails to parse a CSS property. r=birtles (12e06d0356)
- Bug 1208385 part 1 - Store a pointer to the owning animation on each KeyframeEffect; r=heycam (8f48533047)
- Bug 1208385 part 2 - Remove stored parent time from KeyframeEffectReadOnly and get the time directly from the owning animation; r=heycam (7bd25845be)
- Bug 1208951 - Part 9: Implement KeyframeEffectReadOnly constructor. r=bzbarsky r=birtles (49049edfac)
- Bug 1208951 - Part 10: Make GetFrames aware of initial/final zero-length segments and discontinuities between segments. r=birtles (71066c4941)
- Bug 1208951 - Part 11: Tests. r=birtles (308ad9ba9f)
- Bug 1210575 part 1: Rename CSS parser function "ParseWebkitPrefixedGradient()" to be more specific, now that we'll have several ways of parsing these expressions. r=heycam (060a01b43a)
- Bug 1210575 part 2: Refactor out the body of a long compound "if" expression into a helper function, IsFunctionTokenValidForBackgroundImage. r=heycam (ed784fb98d)
- Bug 1210575 part 3: Refactor CSS gradient-parsing code to use a flags bitfield instead of multiple bool args for customizing behavior. r=heycam (5c9df6466c)
- Bug 1210575 part 4: Prevent CSS parser from invoking CSSUnprefixingService if native webkit prefix support is enabled. r=heycam (d4c7997c94)
- Bug 1210575 part 5: Allow CSS -webkit-{linear|radial}-gradient expressions (& 'repeating' variants) to make it to our gradient-parsing code, if webkit prefix support is preffed on. r=heycam (4113bb47c4)
- Bug 1207002 - Use CSS property flag to restrict MathML-related internal properties. r=dbaron (9b021c7819)
- Bug 1199610 - Correctly handle parsing failures inside CSS functions. r=dbaron (5255fe445d)
- Bug 1210575 part 6: Implement -webkit-radial-gradient parse quirks with contain/cover keywords, sized shapes, "at" keyword, & angles. r=heycam (ba1002fbae)
- Bug 1210575 part 7: Refactor linear-gradient parsing code slightly & add/extend comments. r=heycam (1bd144ff04)
- Bug 1210575 part 8: Implement -webkit-linear-gradient parse quirks with "to", angles, and "center". r=heycam (97587d49ea)
- Bug 1210575 part 9: Remove some obsolete XXXdholbert comments from property_database.js. (no review, comment-only so DONTBUILD) (961a2c43e9)
- Bug 978833 patch 2 - Make css::Declaration reference-counted. r=heycam (4aab911856)
This commit is contained in:
+58
-38
@@ -168,6 +168,7 @@
|
||||
#include "mozilla/Telemetry.h"
|
||||
#include "nsCanvasFrame.h"
|
||||
#include "nsIImageLoadingContent.h"
|
||||
#include "nsImageFrame.h"
|
||||
#include "nsIScreen.h"
|
||||
#include "nsIScreenManager.h"
|
||||
#include "nsPlaceholderFrame.h"
|
||||
@@ -1407,7 +1408,7 @@ PresShell::UpdatePreferenceStyles()
|
||||
|
||||
RemovePreferenceStyles();
|
||||
|
||||
mStyleSet->AppendStyleSheet(nsStyleSet::eUserSheet, newPrefSheet);
|
||||
mStyleSet->AppendStyleSheet(SheetType::User, newPrefSheet);
|
||||
mPrefStyleSheet = newPrefSheet;
|
||||
|
||||
mStyleSet->EndUpdate();
|
||||
@@ -1417,7 +1418,7 @@ void
|
||||
PresShell::RemovePreferenceStyles()
|
||||
{
|
||||
if (mPrefStyleSheet) {
|
||||
mStyleSet->RemoveStyleSheet(nsStyleSet::eUserSheet, mPrefStyleSheet);
|
||||
mStyleSet->RemoveStyleSheet(SheetType::User, mPrefStyleSheet);
|
||||
mPrefStyleSheet = nullptr;
|
||||
}
|
||||
}
|
||||
@@ -1441,13 +1442,13 @@ PresShell::AddUserSheet(nsISupports* aSheet)
|
||||
// Iterate forwards when removing so the searches for RemoveStyleSheet are as
|
||||
// short as possible.
|
||||
for (i = 0; i < userSheets.Count(); ++i) {
|
||||
mStyleSet->RemoveStyleSheet(nsStyleSet::eUserSheet, userSheets[i]);
|
||||
mStyleSet->RemoveStyleSheet(SheetType::User, userSheets[i]);
|
||||
}
|
||||
|
||||
// Now iterate backwards, so that the order of userSheets will be the same as
|
||||
// the order of sheets from it in the style set.
|
||||
for (i = userSheets.Count() - 1; i >= 0; --i) {
|
||||
mStyleSet->PrependStyleSheet(nsStyleSet::eUserSheet, userSheets[i]);
|
||||
mStyleSet->PrependStyleSheet(SheetType::User, userSheets[i]);
|
||||
}
|
||||
|
||||
mStyleSet->EndUpdate();
|
||||
@@ -1465,7 +1466,7 @@ PresShell::AddAgentSheet(nsISupports* aSheet)
|
||||
return;
|
||||
}
|
||||
|
||||
mStyleSet->AppendStyleSheet(nsStyleSet::eAgentSheet, sheet);
|
||||
mStyleSet->AppendStyleSheet(SheetType::Agent, sheet);
|
||||
ReconstructStyleData();
|
||||
}
|
||||
|
||||
@@ -1481,16 +1482,16 @@ PresShell::AddAuthorSheet(nsISupports* aSheet)
|
||||
// added with the StyleSheetService.
|
||||
nsIStyleSheet* firstAuthorSheet = mDocument->FirstAdditionalAuthorSheet();
|
||||
if (firstAuthorSheet) {
|
||||
mStyleSet->InsertStyleSheetBefore(nsStyleSet::eDocSheet, sheet, firstAuthorSheet);
|
||||
mStyleSet->InsertStyleSheetBefore(SheetType::Doc, sheet, firstAuthorSheet);
|
||||
} else {
|
||||
mStyleSet->AppendStyleSheet(nsStyleSet::eDocSheet, sheet);
|
||||
mStyleSet->AppendStyleSheet(SheetType::Doc, sheet);
|
||||
}
|
||||
|
||||
ReconstructStyleData();
|
||||
}
|
||||
|
||||
void
|
||||
PresShell::RemoveSheet(nsStyleSet::sheetType aType, nsISupports* aSheet)
|
||||
PresShell::RemoveSheet(SheetType aType, nsISupports* aSheet)
|
||||
{
|
||||
nsCOMPtr<nsIStyleSheet> sheet = do_QueryInterface(aSheet);
|
||||
if (!sheet) {
|
||||
@@ -4071,12 +4072,10 @@ PresShell::FlushPendingNotifications(mozilla::ChangesToFlush aFlush)
|
||||
if (aFlush.mFlushAnimations &&
|
||||
!mPresContext->StyleUpdateForAllAnimationsIsUpToDate()) {
|
||||
if (mPresContext->AnimationManager()) {
|
||||
mPresContext->AnimationManager()->
|
||||
FlushAnimations(CommonAnimationManager::Cannot_Throttle);
|
||||
mPresContext->AnimationManager()->FlushAnimations();
|
||||
}
|
||||
if (mPresContext->TransitionManager()) {
|
||||
mPresContext->TransitionManager()->
|
||||
FlushAnimations(CommonAnimationManager::Cannot_Throttle);
|
||||
mPresContext->TransitionManager()->FlushAnimations();
|
||||
}
|
||||
mPresContext->TickLastStyleUpdateForAllAnimations();
|
||||
}
|
||||
@@ -8685,10 +8684,10 @@ nsresult
|
||||
PresShell::GetAgentStyleSheets(nsCOMArray<nsIStyleSheet>& aSheets)
|
||||
{
|
||||
aSheets.Clear();
|
||||
int32_t sheetCount = mStyleSet->SheetCount(nsStyleSet::eAgentSheet);
|
||||
int32_t sheetCount = mStyleSet->SheetCount(SheetType::Agent);
|
||||
|
||||
for (int32_t i = 0; i < sheetCount; ++i) {
|
||||
nsIStyleSheet *sheet = mStyleSet->StyleSheetAt(nsStyleSet::eAgentSheet, i);
|
||||
nsIStyleSheet *sheet = mStyleSet->StyleSheetAt(SheetType::Agent, i);
|
||||
if (!aSheets.AppendObject(sheet))
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
@@ -8699,19 +8698,19 @@ PresShell::GetAgentStyleSheets(nsCOMArray<nsIStyleSheet>& aSheets)
|
||||
nsresult
|
||||
PresShell::SetAgentStyleSheets(const nsCOMArray<nsIStyleSheet>& aSheets)
|
||||
{
|
||||
return mStyleSet->ReplaceSheets(nsStyleSet::eAgentSheet, aSheets);
|
||||
return mStyleSet->ReplaceSheets(SheetType::Agent, aSheets);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PresShell::AddOverrideStyleSheet(nsIStyleSheet *aSheet)
|
||||
{
|
||||
return mStyleSet->PrependStyleSheet(nsStyleSet::eOverrideSheet, aSheet);
|
||||
return mStyleSet->PrependStyleSheet(SheetType::Override, aSheet);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PresShell::RemoveOverrideStyleSheet(nsIStyleSheet *aSheet)
|
||||
{
|
||||
return mStyleSet->RemoveStyleSheet(nsStyleSet::eOverrideSheet, aSheet);
|
||||
return mStyleSet->RemoveStyleSheet(SheetType::Override, aSheet);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -9402,6 +9401,11 @@ PresShell::Observe(nsISupports* aSubject,
|
||||
const char* aTopic,
|
||||
const char16_t* aData)
|
||||
{
|
||||
if (mIsDestroying) {
|
||||
NS_WARNING("our observers should have been unregistered by now");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
if (!nsCRT::strcmp(aTopic, "chrome-flush-skin-caches")) {
|
||||
nsIFrame *rootFrame = mFrameConstructor->GetRootFrame();
|
||||
@@ -9456,17 +9460,17 @@ PresShell::Observe(nsISupports* aSubject,
|
||||
}
|
||||
|
||||
if (!nsCRT::strcmp(aTopic, "agent-sheet-removed") && mStyleSet) {
|
||||
RemoveSheet(nsStyleSet::eAgentSheet, aSubject);
|
||||
RemoveSheet(SheetType::Agent, aSubject);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (!nsCRT::strcmp(aTopic, "user-sheet-removed") && mStyleSet) {
|
||||
RemoveSheet(nsStyleSet::eUserSheet, aSubject);
|
||||
RemoveSheet(SheetType::User, aSubject);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (!nsCRT::strcmp(aTopic, "author-sheet-removed") && mStyleSet) {
|
||||
RemoveSheet(nsStyleSet::eDocSheet, aSubject);
|
||||
RemoveSheet(SheetType::Doc, aSubject);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@@ -9809,35 +9813,35 @@ PresShell::CloneStyleSet(nsStyleSet* aSet)
|
||||
{
|
||||
nsStyleSet *clone = new nsStyleSet();
|
||||
|
||||
int32_t i, n = aSet->SheetCount(nsStyleSet::eOverrideSheet);
|
||||
int32_t i, n = aSet->SheetCount(SheetType::Override);
|
||||
for (i = 0; i < n; i++) {
|
||||
nsIStyleSheet* ss = aSet->StyleSheetAt(nsStyleSet::eOverrideSheet, i);
|
||||
nsIStyleSheet* ss = aSet->StyleSheetAt(SheetType::Override, i);
|
||||
if (ss)
|
||||
clone->AppendStyleSheet(nsStyleSet::eOverrideSheet, ss);
|
||||
clone->AppendStyleSheet(SheetType::Override, ss);
|
||||
}
|
||||
|
||||
// The document expects to insert document stylesheets itself
|
||||
#if 0
|
||||
n = aSet->SheetCount(nsStyleSet::eDocSheet);
|
||||
n = aSet->SheetCount(SheetType::Doc);
|
||||
for (i = 0; i < n; i++) {
|
||||
nsIStyleSheet* ss = aSet->StyleSheetAt(nsStyleSet::eDocSheet, i);
|
||||
nsIStyleSheet* ss = aSet->StyleSheetAt(SheetType::Doc, i);
|
||||
if (ss)
|
||||
clone->AddDocStyleSheet(ss, mDocument);
|
||||
}
|
||||
#endif
|
||||
|
||||
n = aSet->SheetCount(nsStyleSet::eUserSheet);
|
||||
n = aSet->SheetCount(SheetType::User);
|
||||
for (i = 0; i < n; i++) {
|
||||
nsIStyleSheet* ss = aSet->StyleSheetAt(nsStyleSet::eUserSheet, i);
|
||||
nsIStyleSheet* ss = aSet->StyleSheetAt(SheetType::User, i);
|
||||
if (ss)
|
||||
clone->AppendStyleSheet(nsStyleSet::eUserSheet, ss);
|
||||
clone->AppendStyleSheet(SheetType::User, ss);
|
||||
}
|
||||
|
||||
n = aSet->SheetCount(nsStyleSet::eAgentSheet);
|
||||
n = aSet->SheetCount(SheetType::Agent);
|
||||
for (i = 0; i < n; i++) {
|
||||
nsIStyleSheet* ss = aSet->StyleSheetAt(nsStyleSet::eAgentSheet, i);
|
||||
nsIStyleSheet* ss = aSet->StyleSheetAt(SheetType::Agent, i);
|
||||
if (ss)
|
||||
clone->AppendStyleSheet(nsStyleSet::eAgentSheet, ss);
|
||||
clone->AppendStyleSheet(SheetType::Agent, ss);
|
||||
}
|
||||
return clone;
|
||||
}
|
||||
@@ -9966,9 +9970,9 @@ PresShell::ListStyleContexts(nsIFrame *aRootFrame, FILE *out, int32_t aIndent)
|
||||
void
|
||||
PresShell::ListStyleSheets(FILE *out, int32_t aIndent)
|
||||
{
|
||||
int32_t sheetCount = mStyleSet->SheetCount(nsStyleSet::eDocSheet);
|
||||
int32_t sheetCount = mStyleSet->SheetCount(SheetType::Doc);
|
||||
for (int32_t i = 0; i < sheetCount; ++i) {
|
||||
mStyleSet->StyleSheetAt(nsStyleSet::eDocSheet, i)->List(out, aIndent);
|
||||
mStyleSet->StyleSheetAt(SheetType::Doc, i)->List(out, aIndent);
|
||||
fputs("\n", out);
|
||||
}
|
||||
}
|
||||
@@ -10721,7 +10725,23 @@ nsresult
|
||||
PresShell::UpdateImageLockingState()
|
||||
{
|
||||
// We're locked if we're both thawed and active.
|
||||
return mDocument->SetImageLockingState(!mFrozen && mIsActive);
|
||||
bool locked = !mFrozen && mIsActive;
|
||||
|
||||
nsresult rv = mDocument->SetImageLockingState(locked);
|
||||
|
||||
if (locked) {
|
||||
// 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()) {
|
||||
nsCOMPtr<nsIContent> content = do_QueryInterface(iter.Get()->GetKey());
|
||||
nsImageFrame* imageFrame = do_QueryFrame(content->GetPrimaryFrame());
|
||||
if (imageFrame) {
|
||||
imageFrame->MaybeDecodeForPredictedSize();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
PresShell*
|
||||
@@ -10949,16 +10969,16 @@ nsresult
|
||||
nsIPresShell::HasRuleProcessorUsedByMultipleStyleSets(uint32_t aSheetType,
|
||||
bool* aRetVal)
|
||||
{
|
||||
nsStyleSet::sheetType type;
|
||||
SheetType type;
|
||||
switch (aSheetType) {
|
||||
case nsIStyleSheetService::AGENT_SHEET:
|
||||
type = nsStyleSet::eAgentSheet;
|
||||
type = SheetType::Agent;
|
||||
break;
|
||||
case nsIStyleSheetService::USER_SHEET:
|
||||
type = nsStyleSet::eUserSheet;
|
||||
type = SheetType::User;
|
||||
break;
|
||||
case nsIStyleSheetService::AUTHOR_SHEET:
|
||||
type = nsStyleSet::eDocSheet;
|
||||
type = SheetType::Doc;
|
||||
break;
|
||||
default:
|
||||
MOZ_ASSERT(false, "unexpected aSheetType value");
|
||||
|
||||
Reference in New Issue
Block a user