Commit f9754e45 authored by Yoshi Huang's avatar Yoshi Huang
Browse files

Bug 1264231 - Part 1: inherit OA from docshell. r=sicking

parent 243006e3

docshell/base/nsDocShell.cpp

+1 −3
Original line number Diff line number Diff line
@@ -1504,9 +1504,7 @@ nsDocShell::LoadURI(nsIURI* aURI, 


  if (aLoadFlags & LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL) {

    inheritPrincipal = false;

    triggeringPrincipal = principalToInheritAttributesFrom ?

      nsNullPrincipal::CreateWithInheritedAttributes(principalToInheritAttributesFrom) :

      nsNullPrincipal::CreateWithInheritedAttributes(this);

    triggeringPrincipal = nsNullPrincipal::CreateWithInheritedAttributes(this);

  }



  uint32_t flags = 0;