Don't set the origin twice when navigating for javascript: URLs

third_party/WebKit/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 54 matching lines @@
 
 DocumentInit::DocumentInit(const KURL& url, LocalFrame* frame, WeakPtrWillBeRawPtr<Document> contextDocument, HTMLImportsController* importsController)
     : m_url(url)
     , m_frame(frame)
     , m_parent(parentDocument(frame))
     , m_owner(ownerDocument(frame))
     , m_contextDocument(contextDocument)
     , m_importsController(importsController)
     , m_createNewRegistrationContext(false)
     , m_shouldReuseDefaultView(frame && frame->shouldReuseDefaultView(url))
+    , m_shouldInheritSecurityOriginFromOwner(url.isEmpty() || url.protocolIsAbout())
 {
 }
 
 DocumentInit::DocumentInit(const DocumentInit& other)
     : m_url(other.m_url)
     , m_frame(other.m_frame)
     , m_parent(other.m_parent)
     , m_owner(other.m_owner)
     , m_contextDocument(other.m_contextDocument)
     , m_importsController(other.m_importsController)
     , m_registrationContext(other.m_registrationContext)
     , m_createNewRegistrationContext(other.m_createNewRegistrationContext)
     , m_shouldReuseDefaultView(other.m_shouldReuseDefaultView)

[sof, 2016/02/06 08:35:29]

Missing initialization of m_shouldInheritSecurityOriginFromOwner

 {
 }
 
 DocumentInit::~DocumentInit()
 {
 }
 
 bool DocumentInit::shouldSetURL() const
 {
     LocalFrame* frame = frameForSecurityContext();
@@ skipping 67 matching lines @@
     return *this;
 }
 
 DocumentInit& DocumentInit::withNewRegistrationContext()
 {
     ASSERT(!m_createNewRegistrationContext && !m_registrationContext);
     m_createNewRegistrationContext = true;
     return *this;
 }
 
+DocumentInit& DocumentInit::withoutInheritingSecurityOrigin()
+{
+    m_shouldInheritSecurityOriginFromOwner = false;
+    return *this;
+}
+
 PassRefPtrWillBeRawPtr<CustomElementRegistrationContext> DocumentInit::registrationContext(Document* document) const
 {
     if (!document->isHTMLDocument() && !document->isXHTMLDocument())
         return nullptr;
 
     if (m_createNewRegistrationContext)
         return CustomElementRegistrationContext::create();
 
     return m_registrationContext.get();
 }
 
 WeakPtrWillBeRawPtr<Document> DocumentInit::contextDocument() const
 {
     return m_contextDocument;
 }
 
 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocument, const KURL& url)
 {
     return DocumentInit(url, 0, contextDocument, 0);
 }
 
 } // namespace blink