Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(718)

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 838903002: Replicate sandbox flags for OOPIF (Blink part 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@iframe-sandbox-flags-part1
Patch Set: Address Daniel's comments. Move sandbox flags inheritance to FrameLoader::effectiveSandboxFlags(). Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 // We must call init() after m_frame is assigned because it is referenced 1628 // We must call init() after m_frame is assigned because it is referenced
1629 // during init(). Note that this may dispatch JS events; the frame may be 1629 // during init(). Note that this may dispatch JS events; the frame may be
1630 // detached after init() returns. 1630 // detached after init() returns.
1631 frame->init(); 1631 frame->init();
1632 return frame; 1632 return frame;
1633 } 1633 }
1634 1634
1635 PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::createChildFrame(const Fra meLoadRequest& request, HTMLFrameOwnerElement* ownerElement) 1635 PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::createChildFrame(const Fra meLoadRequest& request, HTMLFrameOwnerElement* ownerElement)
1636 { 1636 {
1637 ASSERT(m_client); 1637 ASSERT(m_client);
1638 WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChild Frame(this, request.frameName())); 1638 WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChild Frame(this, request.frameName(), static_cast<WebSandboxFlags>(ownerElement->sand boxFlags())));
1639 if (!webframeChild) 1639 if (!webframeChild)
1640 return nullptr; 1640 return nullptr;
1641 1641
1642 // FIXME: Using subResourceAttributeName as fallback is not a perfect 1642 // FIXME: Using subResourceAttributeName as fallback is not a perfect
1643 // solution. subResourceAttributeName returns just one attribute name. The 1643 // solution. subResourceAttributeName returns just one attribute name. The
1644 // element might not have the attribute, and there might be other attributes 1644 // element might not have the attribute, and there might be other attributes
1645 // which can identify the element. 1645 // which can identify the element.
1646 RefPtrWillBeRawPtr<LocalFrame> child = webframeChild->initializeCoreFrame(fr ame()->host(), ownerElement, request.frameName(), ownerElement->getAttribute(own erElement->subResourceAttributeName())); 1646 RefPtrWillBeRawPtr<LocalFrame> child = webframeChild->initializeCoreFrame(fr ame()->host(), ownerElement, request.frameName(), ownerElement->getAttribute(own erElement->subResourceAttributeName()));
1647 // Initializing the core frame may cause the new child to be detached, since 1647 // Initializing the core frame may cause the new child to be detached, since
1648 // it may dispatch a load event in the parent. 1648 // it may dispatch a load event in the parent.
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
2012 { 2012 {
2013 m_frameWidget = frameWidget; 2013 m_frameWidget = frameWidget;
2014 } 2014 }
2015 2015
2016 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const 2016 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const
2017 { 2017 {
2018 return m_frameWidget; 2018 return m_frameWidget;
2019 } 2019 }
2020 2020
2021 } // namespace blink 2021 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698