Commit 3c5991df authored by Simon Friedberger's avatar Simon Friedberger
Browse files

Bug 1549057 - Rename (Gg)etCSP to (Gg)etCsp - r=freddyb 

Differential Revision: https://phabricator.services.mozilla.com/D159268
parent ceb646d1

browser/base/content/browser.js

+4 −4
Original line number Diff line number Diff line
@@ -3643,8 +3643,8 @@ var browserDragAndDrop = { 
    return Services.droppedLinkHandler.getTriggeringPrincipal(aEvent);

  },



  getCSP(aEvent) {

    return Services.droppedLinkHandler.getCSP(aEvent);

  getCsp(aEvent) {

    return Services.droppedLinkHandler.getCsp(aEvent);

  },



  validateURIsForDrop(aEvent, aURIs) {
@@ -3737,7 +3737,7 @@ var newTabButtonObserver = { 


    let where = aEvent.shiftKey ? "tabshifted" : "tab";

    let triggeringPrincipal = browserDragAndDrop.getTriggeringPrincipal(aEvent);

    let csp = browserDragAndDrop.getCSP(aEvent);

    let csp = browserDragAndDrop.getCsp(aEvent);

    for (let link of links) {

      if (link.url) {

        let data = await UrlbarUtils.getShortcutOrURIAndPostData(link.url);
@@ -3774,7 +3774,7 @@ var newWindowButtonObserver = { 
    }



    let triggeringPrincipal = browserDragAndDrop.getTriggeringPrincipal(aEvent);

    let csp = browserDragAndDrop.getCSP(aEvent);

    let csp = browserDragAndDrop.getCsp(aEvent);

    for (let link of links) {

      if (link.url) {

        let data = await UrlbarUtils.getShortcutOrURIAndPostData(link.url);

browser/base/content/tabbrowser-tabs.js

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ 
        let replace = !!targetTab;

        let newIndex = this._getDropIndex(event, true);

        let urls = links.map(link => link.url);

        let csp = browserDragAndDrop.getCSP(event);

        let csp = browserDragAndDrop.getCsp(event);

        let triggeringPrincipal = browserDragAndDrop.getTriggeringPrincipal(

          event

        );

docshell/base/nsDocShellTreeOwner.cpp

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ nsDocShellTreeOwner::HandleEvent(Event* aEvent) { 
              LoadURIOptions loadURIOptions;

              loadURIOptions.mTriggeringPrincipal = triggeringPrincipal;

              nsCOMPtr<nsIContentSecurityPolicy> csp;

              handler->GetCSP(dragEvent, getter_AddRefs(csp));

              handler->GetCsp(dragEvent, getter_AddRefs(csp));

              loadURIOptions.mCsp = csp;

              webnav->LoadURI(url, loadURIOptions);

            }

dom/base/ContentAreaDropListener.jsm

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ ContentAreaDropListener.prototype = { 
    return this._getTriggeringPrincipalFromDataTransfer(dataTransfer, true);

  },



  getCSP(aEvent) {

  getCsp(aEvent) {

    let sourceNode = aEvent.dataTransfer.mozSourceNode;

    if (aEvent.dataTransfer.mozCSP !== null) {

      return aEvent.dataTransfer.mozCSP;

dom/base/Document.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3763,7 +3763,7 @@ nsresult Document::InitCSP(nsIChannel* aChannel) { 
    mCSP->AppendPolicy(addonPolicy->ExtensionPageCSP(), false, false);

    // Bug 1548468: Move CSP off ExpandedPrincipal

    // Currently the LoadInfo holds the source of truth for every resource load

    // because LoadInfo::GetCSP() queries the CSP from an ExpandedPrincipal

    // because LoadInfo::GetCsp() queries the CSP from an ExpandedPrincipal

    // (and not from the Client) if the load was triggered by an extension.

    auto* basePrin = BasePrincipal::Cast(principal);

    if (basePrin->Is<ExpandedPrincipal>()) {