[HTML Import] Respect Content Security Policy Model

Source/core/dom/DocumentInit.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
@@ skipping 25 matching lines @@
 bool DocumentInit::shouldSetURL() const
 {
     return (m_frame && m_frame->ownerElement()) || !m_url.isEmpty();
 }
 
 bool DocumentInit::shouldTreatURLAsSrcdocDocument() const
 {
     return m_frame->loader()->shouldTreatURLAsSrcdocDocument(m_url);
 }
 
+Frame* DocumentInit::frameForSecurityContext() const
+{
+    if (m_frame)
+        return m_frame;
+    if (m_import)
+        return m_import->frame();
+    return 0;
+}
+
 SandboxFlags DocumentInit::sandboxFlags() const
 {
-    return m_frame->loader()->effectiveSandboxFlags();
+    return frameForSecurityContext()->loader()->effectiveSandboxFlags();

[Mike West, 2013/07/22 14:39:42]

It looks like this can now be null?

 }
 
 Settings* DocumentInit::settings() const
 {
-    return m_frame->settings();
+    return frameForSecurityContext()->settings();

[Mike West, 2013/07/22 14:39:42]

Ditto.

 }
 
 Frame* DocumentInit::ownerFrame() const
 {
+    if (!m_frame)
+        return 0;
+
     Frame* ownerFrame = m_frame->tree()->parent();
     if (!ownerFrame)
         ownerFrame = m_frame->loader()->opener();
     return ownerFrame;
 }
 
 } // namespace WebCore