Allow .js preference files to set locked prefs with lockPref()

Gbp-Pq: Topic fixes
Gbp-Pq: Name Allow-.js-preference-files-to-set-locked-prefs-with-.patch

diff --git a/modules/libpref/prefapi.cpp b/modules/libpref/prefapi.cpp
index dd2776987ef9465cc4ebc30cdc81bf6a3b37cf71..bd3f8eaaa9f7b365758d644c09cfe43e2d9ac756 100644 (file)
--- a/modules/libpref/prefapi.cpp
+++ b/modules/libpref/prefapi.cpp
@@ -967,11 +967,14 @@ void PREF_ReaderCallback(void       *closure,
                          PrefValue   value,
                          PrefType    type,
                          bool        isDefault,
-                         bool        isStickyDefault)
+                         bool        isStickyDefault,
+                         bool        isLocked)
 {
     uint32_t flags = isDefault ? kPrefSetDefault : kPrefForceSet;
     if (isDefault && isStickyDefault) {
         flags |= kPrefStickyDefault;
     }
     pref_HashPref(pref, value, type, flags);
+    if (isLocked)
+        PREF_LockPref(pref, true);
 }

diff --git a/modules/libpref/prefapi.h b/modules/libpref/prefapi.h
index 5bd8c43bb9997044066d364d5a5c5b59bb78e325..0ab0d7cdaa1d102a7c2286f380afb91d1b3ab9bd 100644 (file)
--- a/modules/libpref/prefapi.h
+++ b/modules/libpref/prefapi.h
@@ -186,7 +186,8 @@ void PREF_ReaderCallback( void *closure,
                           PrefValue   value,
                           PrefType    type,
                           bool        isDefault,
-                          bool        isStickyDefault);
+                          bool        isStickyDefault,
+                          bool        isLocked);
 
 #ifdef __cplusplus
 }

diff --git a/modules/libpref/prefread.cpp b/modules/libpref/prefread.cpp
index 6c4d339894f2924f8e0a9ab26d2f02d6e89b8b02..16c50573a491161e795f53e3711d2b83adfa6703 100644 (file)
--- a/modules/libpref/prefread.cpp
+++ b/modules/libpref/prefread.cpp
@@ -43,6 +43,7 @@ enum {
 #define BITS_PER_HEX_DIGIT      4
 
 static const char kUserPref[] = "user_pref";
+static const char kLockPref[] = "lockPref";
 static const char kPref[] = "pref";
 static const char kPrefSticky[] = "sticky_pref";
 static const char kTrue[] = "true";
@@ -131,7 +132,7 @@ pref_DoCallback(PrefParseState *ps)
         break;
     }
     (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault,
-                  ps->fstickydefault);
+                  ps->fstickydefault, ps->flock);
     return true;
 }
 
@@ -191,6 +192,7 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen)
                 ps->vtype = PREF_INVALID;
                 ps->fdefault = false;
                 ps->fstickydefault = false;
+                ps->flock = false;
             }
             switch (c) {
             case '/':       /* begin comment block or line? */
@@ -202,8 +204,10 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen)
             case 'u':       /* indicating user_pref */
             case 'p':       /* indicating pref */
             case 's':       /* indicating sticky_pref */
+            case 'l':       /* indicating lockPref */
                 ps->smatch = (c == 'u' ? kUserPref :
-                             (c == 's' ? kPrefSticky : kPref));
+                             (c == 's' ? kPrefSticky :
+                             (c == 'p' ? kPref : kLockPref)));
                 ps->sindex = 1;
                 ps->nextstate = PREF_PARSE_UNTIL_OPEN_PAREN;
                 state = PREF_PARSE_MATCH_STRING;
@@ -247,8 +251,10 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen)
         /* name parsing */
         case PREF_PARSE_UNTIL_NAME:
             if (c == '\"' || c == '\'') {
-                ps->fdefault = (ps->smatch == kPref || ps->smatch == kPrefSticky);
+                ps->fdefault = (ps->smatch == kPref || ps->smatch == kPrefSticky
+                                || ps->smatch == kLockPref);
                 ps->fstickydefault = (ps->smatch == kPrefSticky);
+                ps->flock = (ps->smatch == kLockPref);
                 ps->quotechar = c;
                 ps->nextstate = PREF_PARSE_UNTIL_COMMA; /* return here when done */
                 state = PREF_PARSE_QUOTED_STRING;

diff --git a/modules/libpref/prefread.h b/modules/libpref/prefread.h
index 3c317ff044d03b1b62a997292f891af50cde1577..0c13057d43c87b4187fca827ba40627009b7c506 100644 (file)
--- a/modules/libpref/prefread.h
+++ b/modules/libpref/prefread.h
@@ -34,7 +34,8 @@ typedef void (*PrefReader)(void       *closure,
                            PrefValue   val,
                            PrefType    type,
                            bool        defPref,
-                           bool        stickyPref);
+                           bool        stickyPref,
+                           bool        lockPref);
 
 /* structure fields are private */
 typedef struct PrefParseState {
@@ -56,6 +57,7 @@ typedef struct PrefParseState {
     PrefType    vtype;      /* PREF_STRING,INT,BOOL          */
     bool        fdefault;   /* true if (default) pref     */
     bool        fstickydefault; /* true if (sticky) pref     */
+    bool        flock;      /* true if pref to be locked     */
 } PrefParseState;
 
 /**