Commit e38c8f9c authored by Tom Schuster's avatar Tom Schuster Committed by tschuster@mozilla.com
Browse files

Bug 1964754 - Remove nsIContentPolicy TYPE_OBJECT_SUBREQUEST.... 

Bug 1964754 - Remove nsIContentPolicy TYPE_OBJECT_SUBREQUEST. r=necko-reviewers,webdriver-reviewers,extension-reviewers,devtools-reviewers,valentin,robwu,whimboo,ochameau

Differential Revision: https://phabricator.services.mozilla.com/D250027
parent 374a3706

devtools/shared/network-observer/NetworkUtils.sys.mjs

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ const LOAD_CAUSE_STRINGS = { 
  [Ci.nsIContentPolicy.TYPE_SUBDOCUMENT]: "subdocument",

  [Ci.nsIContentPolicy.TYPE_PING]: "ping",

  [Ci.nsIContentPolicy.TYPE_XMLHTTPREQUEST]: "xhr",

  [Ci.nsIContentPolicy.TYPE_OBJECT_SUBREQUEST]: "objectSubdoc",

  [Ci.nsIContentPolicy.TYPE_DTD]: "dtd",

  [Ci.nsIContentPolicy.TYPE_FONT]: "font",

  [Ci.nsIContentPolicy.TYPE_MEDIA]: "media",

dom/base/nsContentPolicyUtils.h

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ inline const char* NS_CP_ContentTypeName(nsContentPolicyType contentType) { 
    CASE_RETURN(TYPE_SUBDOCUMENT);

    CASE_RETURN(TYPE_PING);

    CASE_RETURN(TYPE_XMLHTTPREQUEST);

    CASE_RETURN(TYPE_OBJECT_SUBREQUEST);

    CASE_RETURN(TYPE_DTD);

    CASE_RETURN(TYPE_FONT);

    CASE_RETURN(TYPE_MEDIA);

dom/base/nsContentUtils.h

+0 −1
Original line number Diff line number Diff line
@@ -3834,7 +3834,6 @@ nsContentUtils::InternalContentPolicyTypeToExternal(nsContentPolicyType aType) { 
    case nsIContentPolicy::TYPE_SUBDOCUMENT:

    case nsIContentPolicy::TYPE_PING:

    case nsIContentPolicy::TYPE_XMLHTTPREQUEST:

    case nsIContentPolicy::TYPE_OBJECT_SUBREQUEST:

    case nsIContentPolicy::TYPE_DTD:

    case nsIContentPolicy::TYPE_FONT:

    case nsIContentPolicy::TYPE_MEDIA:

dom/base/nsIContentPolicy.idl

+4 −6
Original line number Diff line number Diff line
@@ -82,11 +82,11 @@ interface nsIContentPolicy : nsISupports 
    TYPE_SUBDOCUMENT = 7,



    /*

     * XXX: nsContentPolicyType = 8 used to inicate a timed refresh request.

     * XXX: nsContentPolicyType = 8 used to indicate a timed refresh request.

     */



    /*

     * XXX: nsContentPolicyType = 9 used to inicate an XBL binding request.

     * XXX: nsContentPolicyType = 9 used to indicate an XBL binding request.

     */



    /**
@@ -99,10 +99,9 @@ interface nsIContentPolicy : nsISupports 
     */

    TYPE_XMLHTTPREQUEST = 11,



    /**

     * Indicates a request by a plugin.

    /*

     * XXX: nsContentPolicyType = 12 used to indicate plugin/object sub-requests.

     */

    TYPE_OBJECT_SUBREQUEST = 12,



    /**

     * Indicates a DTD loaded by an XML document.
@@ -600,7 +599,6 @@ enum class ExtContentPolicyType : uint8_t { 
  TYPE_SUBDOCUMENT = nsIContentPolicy::TYPE_SUBDOCUMENT,

  TYPE_PING = nsIContentPolicy::TYPE_PING,

  TYPE_XMLHTTPREQUEST = nsIContentPolicy::TYPE_XMLHTTPREQUEST,

  TYPE_OBJECT_SUBREQUEST = nsIContentPolicy::TYPE_OBJECT_SUBREQUEST,

  TYPE_DTD = nsIContentPolicy::TYPE_DTD,

  TYPE_FONT = nsIContentPolicy::TYPE_FONT,

  TYPE_MEDIA = nsIContentPolicy::TYPE_MEDIA,

dom/cache/DBSchema.cpp

+0 −1
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ static_assert( 
        nsIContentPolicy::TYPE_SUBDOCUMENT == 7 &&

        nsIContentPolicy::TYPE_PING == 10 &&

        nsIContentPolicy::TYPE_XMLHTTPREQUEST == 11 &&

        nsIContentPolicy::TYPE_OBJECT_SUBREQUEST == 12 &&

        nsIContentPolicy::TYPE_DTD == 13 && nsIContentPolicy::TYPE_FONT == 14 &&

        nsIContentPolicy::TYPE_MEDIA == 15 &&

        nsIContentPolicy::TYPE_WEBSOCKET == 16 &&