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