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 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
827 | 827 |
828 FrameLoaderClient* LocalFrame::client() const | 828 FrameLoaderClient* LocalFrame::client() const |
829 { | 829 { |
830 return static_cast<FrameLoaderClient*>(Frame::client()); | 830 return static_cast<FrameLoaderClient*>(Frame::client()); |
831 } | 831 } |
832 | 832 |
833 PluginData* LocalFrame::pluginData() const | 833 PluginData* LocalFrame::pluginData() const |
834 { | 834 { |
835 if (!loader().allowPlugins(NotAboutToInstantiatePlugin)) | 835 if (!loader().allowPlugins(NotAboutToInstantiatePlugin)) |
836 return nullptr; | 836 return nullptr; |
837 return page()->pluginData(); | 837 return page()->pluginData(tree().top()->securityContext()->getSecurityOrigin
()); |
838 } | 838 } |
839 | 839 |
840 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); | 840 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); |
841 | 841 |
842 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame) | 842 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame) |
843 : m_frame(&frame) | 843 : m_frame(&frame) |
844 { | 844 { |
845 m_frame->disableNavigation(); | 845 m_frame->disableNavigation(); |
846 } | 846 } |
847 | 847 |
848 FrameNavigationDisabler::~FrameNavigationDisabler() | 848 FrameNavigationDisabler::~FrameNavigationDisabler() |
849 { | 849 { |
850 m_frame->enableNavigation(); | 850 m_frame->enableNavigation(); |
851 } | 851 } |
852 | 852 |
853 ScopedFrameBlamer::ScopedFrameBlamer(LocalFrame* frame) | 853 ScopedFrameBlamer::ScopedFrameBlamer(LocalFrame* frame) |
854 : m_frame(frame) | 854 : m_frame(frame) |
855 { | 855 { |
856 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 856 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
857 m_frame->client()->frameBlameContext()->Enter(); | 857 m_frame->client()->frameBlameContext()->Enter(); |
858 } | 858 } |
859 | 859 |
860 ScopedFrameBlamer::~ScopedFrameBlamer() | 860 ScopedFrameBlamer::~ScopedFrameBlamer() |
861 { | 861 { |
862 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 862 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
863 m_frame->client()->frameBlameContext()->Leave(); | 863 m_frame->client()->frameBlameContext()->Leave(); |
864 } | 864 } |
865 | 865 |
866 } // namespace blink | 866 } // namespace blink |
OLD | NEW |