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 1197901, ensure sensor events dispatching follows the becoming spec change, r=bz (f12fe4497c) - Bug 1252055 P1 Make equivalent ServiceWorker DOM objects strictly equal in js. r=ehsan (cfd6649aa2) - Bug 1200884: Make postmessage-to-client.https.html pass. r=jdm (7903e29cd3) - Bug 1188545 - Make skip-waiting-using-registration.html wpt test pass. a=testonly (653f688ffb) - Bug 1230164 P1 Ensure all service worker WPT tests remove controlled frames before completion. r=ehsan (0ca838a64d) - Bug 1230164 P2 Only activate service workers in the activating state. r=ehsan (1a33f147d5) - Bug 1230164 P3 Disable service worker update wpt tests for now. r=ehsan (51fde469a1) - Bug 1252055 P2 Update tests to verify ServiceWorker object equality. r=ehsan (8520f66261) - Bug 1214293, initialize show focus rings state properly in all child frames, r=smaug (6547290d14) - Bug 735251 - don't show focusrings on HTML video / audio elements on non-Windows when focused by mouse, r=bz (769932daf3) - Bug 932080 - Support default values in destructuring; r=jorendorff (97d0f50478) - Bug 1251480 - Implement Rooted<UniquePtr<T>>, r=terrence (86750eefef) - Bug 1251480 - Use Rooted<UniquePtr<StateData>> in place of StateData::CustomAutoRooter, r=bz (e1d40cbac2) - Bug 1248153 - Do not convert fp to int by cast. r=waldo (c0a759bfd5) - Bug 1254335 - Remove invalid assertion; r=jorendorff (9b9e3f050e) - Bug 1251667 - Add a measure SLOW_SCRIPT_PAGE_COUNT, which measures the number of pages per session that have slow scripts. r=wmccloskey (6ce4d8e0ca) - Bug 1245185: Remove dead event handling code from nsPIDOMWindow<T>. r=smaug (01f8e77997) - Bug 1252268: If the slow script dialog aborts an interval timer callback, don't schedule it again. r=bz (62c0828435) - Bug 1245554. Window's named properties object should not claim to have duplicates of a given property name if it has multiple iframes with that name. r=peterv (78d5c55972) - Bug 1255709. Simplify the JSContext/GlobalObject handling in ServiceWorkerRegistrationMainThread::GetPushManager a bit. r=bkelly (d157739571) - Bug 1255655 - Const-ify and shrink kEntities and kAttrEntities. r=baku. (06dc0615ed) - Bug 1228950 - Disallow scheme sets on nsHostObjectURI. r=bz (667c190935) - Bug 1225864 - New flag OutputDisallowLineBreaking to disallow line breaking. r=masayuki. (f0e4d46807) - Bug 1032979 part 1. Refactor the outerHTML web platform test to make it easier to add an XML version. r=smaug (6643f0678b) - Bug 1032979 part 2. Getting outerHTML on a node from an XML document should not use the self-closing form of empty container tags from the HTML namespace. r=smaug (e3905a9c02)
This commit is contained in:
@@ -401,50 +401,66 @@ nsHTMLContentSerializer::AppendElementEnd(Element* aElement,
|
||||
}
|
||||
|
||||
static const uint16_t kValNBSP = 160;
|
||||
static const char* kEntities[] = {
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, "&", nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
"<", nullptr, ">", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
" "
|
||||
|
||||
#define _ 0
|
||||
|
||||
// This table indexes into kEntityStrings[].
|
||||
static const uint8_t kEntities[] = {
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, 2, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
3, _, 4, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
5
|
||||
};
|
||||
|
||||
static const char* kAttrEntities[] = {
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, """, nullptr, nullptr, nullptr, "&", nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
"<", nullptr, ">", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
" "
|
||||
// This table indexes into kEntityStrings[].
|
||||
static const uint8_t kAttrEntities[] = {
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, 1, _, _, _, 2, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
3, _, 4, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
_, _, _, _, _, _, _, _, _, _,
|
||||
5
|
||||
};
|
||||
|
||||
#undef _
|
||||
|
||||
static const char* const kEntityStrings[] = {
|
||||
/* 0 */ nullptr,
|
||||
/* 1 */ """,
|
||||
/* 2 */ "&",
|
||||
/* 3 */ "<",
|
||||
/* 4 */ ">",
|
||||
/* 5 */ " "
|
||||
};
|
||||
|
||||
uint32_t FindNextBasicEntity(const nsAString& aStr,
|
||||
const uint32_t aLen,
|
||||
uint32_t aIndex,
|
||||
const char** aEntityTable,
|
||||
const uint8_t* aEntityTable,
|
||||
const char** aEntity)
|
||||
{
|
||||
for (; aIndex < aLen; ++aIndex) {
|
||||
@@ -452,7 +468,7 @@ uint32_t FindNextBasicEntity(const nsAString& aStr,
|
||||
// needs to be replaced
|
||||
char16_t val = aStr[aIndex];
|
||||
if (val <= kValNBSP && aEntityTable[val]) {
|
||||
*aEntity = aEntityTable[val];
|
||||
*aEntity = kEntityStrings[aEntityTable[val]];
|
||||
return aIndex;
|
||||
}
|
||||
}
|
||||
@@ -478,7 +494,7 @@ nsHTMLContentSerializer::AppendAndTranslateEntities(const nsAString& aStr,
|
||||
|
||||
if (!nonBasicEntities &&
|
||||
(mFlags & (nsIDocumentEncoder::OutputEncodeBasicEntities))) {
|
||||
const char **entityTable = mInAttribute ? kAttrEntities : kEntities;
|
||||
const uint8_t* entityTable = mInAttribute ? kAttrEntities : kEntities;
|
||||
uint32_t start = 0;
|
||||
const uint32_t len = aStr.Length();
|
||||
for (uint32_t i = 0; i < len; ++i) {
|
||||
@@ -510,7 +526,7 @@ nsHTMLContentSerializer::AppendAndTranslateEntities(const nsAString& aStr,
|
||||
uint32_t advanceLength = 0;
|
||||
nsReadingIterator<char16_t> iter;
|
||||
|
||||
const char **entityTable = mInAttribute ? kAttrEntities : kEntities;
|
||||
const uint8_t* entityTable = mInAttribute ? kAttrEntities : kEntities;
|
||||
nsAutoCString entityReplacement;
|
||||
|
||||
for (aStr.BeginReading(iter);
|
||||
@@ -532,7 +548,7 @@ nsHTMLContentSerializer::AppendAndTranslateEntities(const nsAString& aStr,
|
||||
for (; c < fragmentEnd; c++, advanceLength++) {
|
||||
char16_t val = *c;
|
||||
if (val <= kValNBSP && entityTable[val]) {
|
||||
fullConstEntityText = entityTable[val];
|
||||
fullConstEntityText = kEntityStrings[entityTable[val]];
|
||||
break;
|
||||
} else if (val > 127 &&
|
||||
((val < 256 &&
|
||||
|
||||
Reference in New Issue
Block a user