wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 20:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2025-07-16 15:39:18 +08:00
commit b59402a1f9
44 changed files with 507 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dom/html/nsTextEditorState.cpp
View file

@ -1809,7 +1809,7 @@ nsTextEditorState::InitializeRootNode()
if (!IsSingleLineTextControl()) {
// We can't just inherit the overflow because setting visible overflow will
// crash when the number of lines exceeds the height of the textarea and
// setting -moz-hidden-unscrollable overflow (NS_STYLE_OVERFLOW_CLIP)
// setting clip overflow (NS_STYLE_OVERFLOW_CLIP)
// doesn't paint the caret for some reason.
const nsStyleDisplay* disp = mBoundFrame->StyleDisplay();
if (disp->mOverflowX != NS_STYLE_OVERFLOW_VISIBLE &&

3
dom/workers/RuntimeService.cpp
View file

@ -37,6 +37,7 @@
#include "mozilla/dom/EventTargetBinding.h"
#include "mozilla/dom/MessageChannel.h"
#include "mozilla/dom/MessageEventBinding.h"
#include "mozilla/dom/nsCSPService.h"
#include "mozilla/dom/WorkerBinding.h"
#include "mozilla/dom/ScriptSettings.h"
#include "mozilla/dom/IndexedDatabaseManager.h"
@ -2715,7 +2716,7 @@ LogViolationDetailsRunnable::MainThreadRun()
{
AssertIsOnMainThread();
if (mWorkerPrivate->CSPEnabled()) {
if (CSPService::sCSPEnabled) {
nsIContentSecurityPolicy* csp = mWorkerPrivate->GetCSP();
if (csp) {
if (mWorkerPrivate->GetReportCSPViolations()) {

8
dom/workers/ScriptLoader.cpp
View file

@ -1102,7 +1102,7 @@ private:
return NS_ERROR_NOT_AVAILABLE;
}
if (mWorkerPrivate->CSPEnabled()) {
if (CSPService::sCSPEnabled) {
httpChannel->GetResponseHeader(
NS_LITERAL_CSTRING("content-security-policy"),
tCspHeaderValue);
@ -1166,7 +1166,7 @@ private:
// by using the SRICheck module
MOZ_LOG(SRILogHelper::GetSriLog(), mozilla::LogLevel::Debug,
("Scriptloader::Load, SRI required but not supported in workers"));
if (mWorkerPrivate->CSPEnabled()) {
if (CSPService::sCSPEnabled) {
nsCOMPtr<nsIContentSecurityPolicy> wcsp;
chanLoadInfo->LoadingPrincipal()->GetCsp(getter_AddRefs(wcsp));
MOZ_ASSERT(wcsp, "We should have a CSP for the worker here");
@ -1325,7 +1325,7 @@ private:
MOZ_ALWAYS_SUCCEEDS(responsePrincipal->Equals(principal, &equal));
MOZ_DIAGNOSTIC_ASSERT(equal);
if (mWorkerPrivate->CSPEnabled()) {
if (CSPService::sCSPEnabled) {
nsCOMPtr<nsIContentSecurityPolicy> csp;
MOZ_ALWAYS_SUCCEEDS(responsePrincipal->GetCsp(getter_AddRefs(csp)));
MOZ_DIAGNOSTIC_ASSERT(!csp);
@ -1342,7 +1342,7 @@ private:
rv = mWorkerPrivate->SetPrincipalOnMainThread(responsePrincipal, loadGroup);
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
if (mWorkerPrivate->CSPEnabled()) {
if (CSPService::sCSPEnabled) {
rv = mWorkerPrivate->SetCSPFromHeaderValues(aCSPHeaderValue,
aCSPReportOnlyHeaderValue);
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));