mirror of
https://github.com/roytam1/mozilla45esr.git
synced 2026-05-26 15:39:48 +00:00
ac0651448a
- issue #385: unconditionally disable JS source compression (6a91f9666) - #359: security.pki.sha1_enforcement_level -> 1 (966d8cab8) - for #375: M1349940 M1355595 M1334635 M1353708 M1354782 M1354781 M1349742 M1345315 M1356655 M1356663 M1357638 M1358809 M1307134 M1331342 M1220466 (964aa7e7c) - #378: ensure remaining users of faulty LZ4 module never execute (922a32738) - #387: pulled nsGenConList.* with relevant deps up to mozilla-central (b1831fc75) - prerequisite for #375: M1347759 (8e58b5c8f) - #375: M1348278 (8d665811d) - #368: pref on Brotli (7da09aa4e) - #375: M1330912 (sync patch only) (bea84e507) - #375: M1342719 M1342720 (f4015e0c1) - Bug 1071646 - Light refactoring of lexical binding helpers in Parser. (r=jorendorff) (167ad8564) - Bug 1071646 - Make functions block-scoped in JS and implement Annex B semantics for compatibility. (r=jorendorff) (25844de1b) - Bug 1071646 - Support labelled function declarations in sloppy mode per Annex B.3.2. (r=jorendorff) (37bf861a9) - Bug 1071646 - Introduce JSOP_BINDVAR to support Annex B.3.3.3. (r=jorendorff) (884bd2ab5) - Bug 1071646 - Cast ParseNode to Definition using as<T>. (r=jorendorff) (feba46e3f) - Bug 1071646 - Support JSOP_BINDVAR in Baseline. (r=jandem) (92b6a3b48) - #372: merge changeset 299512 (c28302281) - Bug 1071646 - Support JSOP_BINDVAR in Ion. (r=jandem) (d05f77998) - Bug 1231758 - Fix bogus assertion in BCE for Annex B function assignment. (r=jorendorff) (a11dcf0cc) - Bug 1234717 - Fix upvar TDZ for block-scoped functions. (r=jorendorff) (2ec542b5a) - Bug 1071646 - Forgot to commit tests on backout and relanding cycle. (r=me) (069a26bf9) - #372: merge changeset 303861 (745f7e7a2) - Bug 1235590 - Allow redeclaring block-scoped functions and warn about deprecation for now. (r=jorendorff) (8a51cc1f9) - Bug 1243793 - Fix handling of labels when emitting hoisted function definitions. (r=jorendorff) (c0ffd70f9) - Bug 1236875 - Fix BytecodeEmitter::atBodyLevel() for modules r=efaust (5b2c22f62) - Bug 1304641 - TraceLogger: Also throw compartment mismatch error when running in the jits, r=bbouvier (717134569) - Bug 1198833 - Variable redeclaration should be a syntax error r=shu (ac6710b0f) - #393, Bug 1135377 - Part 1: Implement RegExp unicode flag. r=till, f=anba (d00063089) - #393, Bug 1135377 - Part 2: Parse RegExp unicode character in non-CharacterClass. r=till, f=anba (c85a176bd) - #393, Bug 1135377 - Part 3: Parse RegExp unicode character in CharacterClass. r=till, f=anba (68f44ec41) - #393, Bug 1135377 - Part 4: Support everything Atom in RegExp with unicode flag. r=till, f=anba (4e924a688) - #393, Bug 1135377 - Part 5: Support CharacterClassEscape in RegExp with unicode flag. r=till, f=anba (45a4712b0) - #393, Bug 1135377 - Part 6: Support ignoreCase for BMP in RegExp with unicode flag. r=till, f=anba (cf744e9d3) - #393, Bug 1135377 - Part 7: Support ignoreCase for non-BMP in RegExp with unicode flag. r=till, f=anba (f31a9f9e8) - #393, Bug 1135377 - Part 8: Disallow extended pattern in RegExp with unicode flag. r=till, f=anba (c05db4075) - #393, Bug 1135377 - Part 9: Use RegExp unicode flag in String.prototype.{match,replace,split}. r=till, f=anba (8636a96b7) - #393, Bug 1135377 - Part 10: Decrement index when it points trail surrogate that has corresponding lead surrogate. r=till, f=anba (522d06ab3) - #393, Bug 1135377 - Part 11: Support back reference with unicode flag. r=till, f=anba (122e41a28) - #393, Bug 1279467 - Fix null handling in RegExp character class with unicode flag. r=till (741f170e6) - #393: bustage fix (3e39760c8) - #393, Bug 1281739 - Do not match K, S, k, s, KELVIN SIGN, LATIN SMALL LETTER LONG S with \W in unicode ignoreCase RegExp. r=till (3c5d4bab8) - #375: M1233101 (a6a0b895f) - #375, #391: branch hint malloc and recursion checks, clean up MAsm type barrier spooge (a008a1978) - closes #380: fix toSource() tests (f9de6783b) - #394: fix and enable ES7 exponentiation operator (6dc5f54dc) - #396: M1342009, plus refactor to PLDHashTable a la M1352888 (06fcc091f) - #375: M1347634 1352235 (aa6b13c59) - #375: M1351303 (f7badd24e) - #375: M1287277 M1259677; temporarily disable M1351303 due to crashes (75d95f15b) - #375: M1363423 M1273828 M1364661 (e7767cdaa)
348 lines
12 KiB
C++
348 lines
12 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
// vim:cindent:ai:sw=4:ts=4:et:
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/* implementation of CSS counters (for numbering things) */
|
|
|
|
#include "nsCounterManager.h"
|
|
|
|
#include "mozilla/Likely.h"
|
|
#include "mozilla/WritingModes.h"
|
|
#include "nsBulletFrame.h" // legacy location for list style type to text code
|
|
#include "nsContentUtils.h"
|
|
#include "nsIContent.h"
|
|
#include "nsTArray.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
bool
|
|
nsCounterUseNode::InitTextFrame(nsGenConList* aList,
|
|
nsIFrame* aPseudoFrame, nsIFrame* aTextFrame)
|
|
{
|
|
nsCounterNode::InitTextFrame(aList, aPseudoFrame, aTextFrame);
|
|
|
|
nsCounterList *counterList = static_cast<nsCounterList*>(aList);
|
|
counterList->Insert(this);
|
|
bool dirty = counterList->IsDirty();
|
|
if (!dirty) {
|
|
if (counterList->IsLast(this)) {
|
|
Calc(counterList);
|
|
nsAutoString contentString;
|
|
GetText(contentString);
|
|
aTextFrame->GetContent()->SetText(contentString, false);
|
|
} else {
|
|
// In all other cases (list already dirty or node not at the end),
|
|
// just start with an empty string for now and when we recalculate
|
|
// the list we'll change the value to the right one.
|
|
counterList->SetDirty();
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
CounterStyle*
|
|
nsCounterUseNode::GetCounterStyle()
|
|
{
|
|
if (!mCounterStyle) {
|
|
const nsCSSValue& style = mCounterFunction->Item(mAllCounters ? 2 : 1);
|
|
CounterStyleManager* manager = mPresContext->CounterStyleManager();
|
|
if (style.GetUnit() == eCSSUnit_Ident) {
|
|
nsString ident;
|
|
style.GetStringValue(ident);
|
|
mCounterStyle = manager->BuildCounterStyle(ident);
|
|
} else if (style.GetUnit() == eCSSUnit_Symbols) {
|
|
mCounterStyle = new AnonymousCounterStyle(style.GetArrayValue());
|
|
} else {
|
|
NS_NOTREACHED("Unknown counter style");
|
|
mCounterStyle = CounterStyleManager::GetDecimalStyle();
|
|
}
|
|
}
|
|
return mCounterStyle;
|
|
}
|
|
|
|
// assign the correct |mValueAfter| value to a node that has been inserted
|
|
// Should be called immediately after calling |Insert|.
|
|
void nsCounterUseNode::Calc(nsCounterList *aList)
|
|
{
|
|
NS_ASSERTION(!aList->IsDirty(),
|
|
"Why are we calculating with a dirty list?");
|
|
mValueAfter = aList->ValueBefore(this);
|
|
}
|
|
|
|
// assign the correct |mValueAfter| value to a node that has been inserted
|
|
// Should be called immediately after calling |Insert|.
|
|
void nsCounterChangeNode::Calc(nsCounterList *aList)
|
|
{
|
|
NS_ASSERTION(!aList->IsDirty(),
|
|
"Why are we calculating with a dirty list?");
|
|
if (mType == RESET) {
|
|
mValueAfter = mChangeValue;
|
|
} else {
|
|
NS_ASSERTION(mType == INCREMENT, "invalid type");
|
|
mValueAfter = nsCounterManager::IncrementCounter(aList->ValueBefore(this),
|
|
mChangeValue);
|
|
}
|
|
}
|
|
|
|
// The text that should be displayed for this counter.
|
|
void
|
|
nsCounterUseNode::GetText(nsString& aResult)
|
|
{
|
|
aResult.Truncate();
|
|
|
|
nsAutoTArray<nsCounterNode*, 8> stack;
|
|
stack.AppendElement(static_cast<nsCounterNode*>(this));
|
|
|
|
if (mAllCounters && mScopeStart)
|
|
for (nsCounterNode *n = mScopeStart; n->mScopePrev; n = n->mScopeStart)
|
|
stack.AppendElement(n->mScopePrev);
|
|
|
|
const char16_t* separator;
|
|
if (mAllCounters)
|
|
separator = mCounterFunction->Item(1).GetStringBufferValue();
|
|
|
|
CounterStyle* style = GetCounterStyle();
|
|
WritingMode wm = mPseudoFrame ?
|
|
mPseudoFrame->GetWritingMode() : WritingMode();
|
|
for (uint32_t i = stack.Length() - 1;; --i) {
|
|
nsCounterNode *n = stack[i];
|
|
nsAutoString text;
|
|
bool isTextRTL;
|
|
style->GetCounterText(n->mValueAfter, wm, text, isTextRTL);
|
|
aResult.Append(text);
|
|
if (i == 0)
|
|
break;
|
|
NS_ASSERTION(mAllCounters, "yikes, separator is uninitialized");
|
|
aResult.Append(separator);
|
|
}
|
|
}
|
|
|
|
void
|
|
nsCounterList::SetScope(nsCounterNode *aNode)
|
|
{
|
|
// This function is responsible for setting |mScopeStart| and
|
|
// |mScopePrev| (whose purpose is described in nsCounterManager.h).
|
|
// We do this by starting from the node immediately preceding
|
|
// |aNode| in content tree order, which is reasonably likely to be
|
|
// the previous element in our scope (or, for a reset, the previous
|
|
// element in the containing scope, which is what we want). If
|
|
// we're not in the same scope that it is, then it's too deep in the
|
|
// frame tree, so we walk up parent scopes until we find something
|
|
// appropriate.
|
|
|
|
if (aNode == First()) {
|
|
aNode->mScopeStart = nullptr;
|
|
aNode->mScopePrev = nullptr;
|
|
return;
|
|
}
|
|
|
|
// Get the content node for aNode's rendering object's *parent*,
|
|
// since scope includes siblings, so we want a descendant check on
|
|
// parents.
|
|
nsIContent *nodeContent = aNode->mPseudoFrame->GetContent()->GetParent();
|
|
|
|
for (nsCounterNode *prev = Prev(aNode), *start;
|
|
prev; prev = start->mScopePrev) {
|
|
// If |prev| starts a scope (because it's a real or implied
|
|
// reset), we want it as the scope start rather than the start
|
|
// of its enclosing scope. Otherwise, there's no enclosing
|
|
// scope, so the next thing in prev's scope shares its scope
|
|
// start.
|
|
start = (prev->mType == nsCounterNode::RESET || !prev->mScopeStart)
|
|
? prev : prev->mScopeStart;
|
|
|
|
// |startContent| is analogous to |nodeContent| (see above).
|
|
nsIContent *startContent = start->mPseudoFrame->GetContent()->GetParent();
|
|
NS_ASSERTION(nodeContent || !startContent,
|
|
"null check on startContent should be sufficient to "
|
|
"null check nodeContent as well, since if nodeContent "
|
|
"is for the root, startContent (which is before it) "
|
|
"must be too");
|
|
|
|
// A reset's outer scope can't be a scope created by a sibling.
|
|
if (!(aNode->mType == nsCounterNode::RESET &&
|
|
nodeContent == startContent) &&
|
|
// everything is inside the root (except the case above,
|
|
// a second reset on the root)
|
|
(!startContent ||
|
|
nsContentUtils::ContentIsDescendantOf(nodeContent,
|
|
startContent))) {
|
|
aNode->mScopeStart = start;
|
|
aNode->mScopePrev = prev;
|
|
return;
|
|
}
|
|
}
|
|
|
|
aNode->mScopeStart = nullptr;
|
|
aNode->mScopePrev = nullptr;
|
|
}
|
|
|
|
void
|
|
nsCounterList::RecalcAll()
|
|
{
|
|
mDirty = false;
|
|
|
|
for (nsCounterNode* node = First(); node; node = Next(node)) {
|
|
SetScope(node);
|
|
node->Calc(this);
|
|
|
|
if (node->mType == nsCounterNode::USE) {
|
|
nsCounterUseNode *useNode = node->UseNode();
|
|
// Null-check mText, since if the frame constructor isn't
|
|
// batching, we could end up here while the node is being
|
|
// constructed.
|
|
if (useNode->mText) {
|
|
nsAutoString text;
|
|
useNode->GetText(text);
|
|
useNode->mText->SetData(text);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
nsCounterManager::nsCounterManager()
|
|
: mNames()
|
|
{
|
|
}
|
|
|
|
bool
|
|
nsCounterManager::AddCounterResetsAndIncrements(nsIFrame *aFrame)
|
|
{
|
|
const nsStyleContent *styleContent = aFrame->StyleContent();
|
|
if (!styleContent->CounterIncrementCount() &&
|
|
!styleContent->CounterResetCount())
|
|
return false;
|
|
|
|
// Add in order, resets first, so all the comparisons will be optimized
|
|
// for addition at the end of the list.
|
|
int32_t i, i_end;
|
|
bool dirty = false;
|
|
for (i = 0, i_end = styleContent->CounterResetCount(); i != i_end; ++i)
|
|
dirty |= AddResetOrIncrement(aFrame, i,
|
|
styleContent->GetCounterResetAt(i),
|
|
nsCounterChangeNode::RESET);
|
|
for (i = 0, i_end = styleContent->CounterIncrementCount(); i != i_end; ++i)
|
|
dirty |= AddResetOrIncrement(aFrame, i,
|
|
styleContent->GetCounterIncrementAt(i),
|
|
nsCounterChangeNode::INCREMENT);
|
|
return dirty;
|
|
}
|
|
|
|
bool
|
|
nsCounterManager::AddResetOrIncrement(nsIFrame *aFrame, int32_t aIndex,
|
|
const nsStyleCounterData *aCounterData,
|
|
nsCounterNode::Type aType)
|
|
{
|
|
nsCounterChangeNode *node =
|
|
new nsCounterChangeNode(aFrame, aType, aCounterData->mValue, aIndex);
|
|
|
|
nsCounterList *counterList = CounterListFor(aCounterData->mCounter);
|
|
|
|
counterList->Insert(node);
|
|
if (!counterList->IsLast(node)) {
|
|
// Tell the caller it's responsible for recalculating the entire
|
|
// list.
|
|
counterList->SetDirty();
|
|
return true;
|
|
}
|
|
|
|
// Don't call Calc() if the list is already dirty -- it'll be recalculated
|
|
// anyway, and trying to calculate with a dirty list doesn't work.
|
|
if (MOZ_LIKELY(!counterList->IsDirty())) {
|
|
node->Calc(counterList);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
nsCounterList*
|
|
nsCounterManager::CounterListFor(const nsSubstring& aCounterName)
|
|
{
|
|
// XXX Why doesn't nsTHashtable provide an API that allows us to use
|
|
// get/put in one hashtable lookup?
|
|
nsCounterList *counterList;
|
|
if (!mNames.Get(aCounterName, &counterList)) {
|
|
counterList = new nsCounterList();
|
|
mNames.Put(aCounterName, counterList);
|
|
}
|
|
return counterList;
|
|
}
|
|
|
|
void
|
|
nsCounterManager::RecalcAll()
|
|
{
|
|
for (auto iter = mNames.Iter(); !iter.Done(); iter.Next()) {
|
|
nsCounterList* list = iter.UserData();
|
|
if (list->IsDirty()) {
|
|
list->RecalcAll();
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
nsCounterManager::SetAllCounterStylesDirty()
|
|
{
|
|
for (auto iter = mNames.Iter(); !iter.Done(); iter.Next()) {
|
|
nsCounterList* list = iter.UserData();
|
|
bool changed = false;
|
|
for (nsCounterNode* node = list->First(); node; node = list->Next(node)) {
|
|
if (node->mType == nsCounterNode::USE) {
|
|
node->UseNode()->SetCounterStyleDirty();
|
|
changed = true;
|
|
}
|
|
}
|
|
|
|
if (changed) {
|
|
list->SetDirty();
|
|
}
|
|
}
|
|
}
|
|
|
|
bool
|
|
nsCounterManager::DestroyNodesFor(nsIFrame *aFrame)
|
|
{
|
|
bool destroyedAny = false;
|
|
for (auto iter = mNames.Iter(); !iter.Done(); iter.Next()) {
|
|
nsCounterList* list = iter.UserData();
|
|
if (list->DestroyNodesFor(aFrame)) {
|
|
destroyedAny = true;
|
|
list->SetDirty();
|
|
}
|
|
}
|
|
return destroyedAny;
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
void
|
|
nsCounterManager::Dump()
|
|
{
|
|
printf("\n\nCounter Manager Lists:\n");
|
|
for (auto iter = mNames.Iter(); !iter.Done(); iter.Next()) {
|
|
printf("Counter named \"%s\":\n",
|
|
NS_ConvertUTF16toUTF8(iter.Key()).get());
|
|
|
|
nsCounterList* list = iter.UserData();
|
|
int32_t i = 0;
|
|
for (nsCounterNode* node = list->First(); node; node = list->Next(node)) {
|
|
const char* types[] = { "RESET", "INCREMENT", "USE" };
|
|
printf(" Node #%d @%p frame=%p index=%d type=%s valAfter=%d\n"
|
|
" scope-start=%p scope-prev=%p",
|
|
i++, (void*)node, (void*)node->mPseudoFrame,
|
|
node->mContentIndex, types[node->mType],
|
|
node->mValueAfter, (void*)node->mScopeStart,
|
|
(void*)node->mScopePrev);
|
|
if (node->mType == nsCounterNode::USE) {
|
|
nsAutoString text;
|
|
node->UseNode()->GetText(text);
|
|
printf(" text=%s", NS_ConvertUTF16toUTF8(text).get());
|
|
}
|
|
printf("\n");
|
|
}
|
|
}
|
|
printf("\n\n");
|
|
}
|
|
#endif
|