Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. |
| 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 840 | 840 |
| 841 FrameLoaderClient* LocalFrame::client() const | 841 FrameLoaderClient* LocalFrame::client() const |
| 842 { | 842 { |
| 843 return static_cast<FrameLoaderClient*>(Frame::client()); | 843 return static_cast<FrameLoaderClient*>(Frame::client()); |
| 844 } | 844 } |
| 845 | 845 |
| 846 PluginData* LocalFrame::pluginData() const | 846 PluginData* LocalFrame::pluginData() const |
| 847 { | 847 { |
| 848 if (!loader().allowPlugins(NotAboutToInstantiatePlugin)) | 848 if (!loader().allowPlugins(NotAboutToInstantiatePlugin)) |
| 849 return nullptr; | 849 return nullptr; |
| 850 return page()->pluginData(); | 850 return page()->pluginData(securityContext()->getSecurityOrigin()); |
|
alexmos
2016/08/10 00:10:29
This should be tree().top()->securityContext()->ge
trizzofo
2016/08/10 00:48:11
Yes, you're right. Fixed it.
| |
| 851 } | 851 } |
| 852 | 852 |
| 853 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); | 853 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); |
| 854 | 854 |
| 855 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame) | 855 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame) |
| 856 : m_frame(&frame) | 856 : m_frame(&frame) |
| 857 { | 857 { |
| 858 m_frame->disableNavigation(); | 858 m_frame->disableNavigation(); |
| 859 } | 859 } |
| 860 | 860 |
| 861 FrameNavigationDisabler::~FrameNavigationDisabler() | 861 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 862 { | 862 { |
| 863 m_frame->enableNavigation(); | 863 m_frame->enableNavigation(); |
| 864 } | 864 } |
| 865 | 865 |
| 866 ScopedFrameBlamer::ScopedFrameBlamer(LocalFrame* frame) | 866 ScopedFrameBlamer::ScopedFrameBlamer(LocalFrame* frame) |
| 867 : m_frame(frame) | 867 : m_frame(frame) |
| 868 { | 868 { |
| 869 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 869 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 870 m_frame->client()->frameBlameContext()->Enter(); | 870 m_frame->client()->frameBlameContext()->Enter(); |
| 871 } | 871 } |
| 872 | 872 |
| 873 ScopedFrameBlamer::~ScopedFrameBlamer() | 873 ScopedFrameBlamer::~ScopedFrameBlamer() |
| 874 { | 874 { |
| 875 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 875 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 876 m_frame->client()->frameBlameContext()->Leave(); | 876 m_frame->client()->frameBlameContext()->Leave(); |
| 877 } | 877 } |
| 878 | 878 |
| 879 } // namespace blink | 879 } // namespace blink |
| OLD | NEW |