| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 #include "platform/DragImage.h" | 71 #include "platform/DragImage.h" |
| 72 #include "platform/PluginScriptForbiddenScope.h" | 72 #include "platform/PluginScriptForbiddenScope.h" |
| 73 #include "platform/RuntimeEnabledFeatures.h" | 73 #include "platform/RuntimeEnabledFeatures.h" |
| 74 #include "platform/ScriptForbiddenScope.h" | 74 #include "platform/ScriptForbiddenScope.h" |
| 75 #include "platform/graphics/GraphicsContext.h" | 75 #include "platform/graphics/GraphicsContext.h" |
| 76 #include "platform/graphics/StaticBitmapImage.h" | 76 #include "platform/graphics/StaticBitmapImage.h" |
| 77 #include "platform/graphics/paint/ClipRecorder.h" | 77 #include "platform/graphics/paint/ClipRecorder.h" |
| 78 #include "platform/graphics/paint/PaintController.h" | 78 #include "platform/graphics/paint/PaintController.h" |
| 79 #include "platform/graphics/paint/SkPictureBuilder.h" | 79 #include "platform/graphics/paint/SkPictureBuilder.h" |
| 80 #include "platform/graphics/paint/TransformDisplayItem.h" | 80 #include "platform/graphics/paint/TransformDisplayItem.h" |
| 81 #include "platform/plugins/PluginData.h" |
| 81 #include "platform/text/TextStream.h" | 82 #include "platform/text/TextStream.h" |
| 82 #include "public/platform/ServiceRegistry.h" | 83 #include "public/platform/ServiceRegistry.h" |
| 83 #include "public/platform/WebFrameScheduler.h" | 84 #include "public/platform/WebFrameScheduler.h" |
| 84 #include "public/platform/WebScreenInfo.h" | 85 #include "public/platform/WebScreenInfo.h" |
| 85 #include "public/platform/WebViewScheduler.h" | 86 #include "public/platform/WebViewScheduler.h" |
| 86 #include "third_party/skia/include/core/SkImage.h" | 87 #include "third_party/skia/include/core/SkImage.h" |
| 87 #include "wtf/PassOwnPtr.h" | 88 #include "wtf/PassOwnPtr.h" |
| 88 #include "wtf/StdLibExtras.h" | 89 #include "wtf/StdLibExtras.h" |
| 89 | 90 |
| 90 namespace blink { | 91 namespace blink { |
| (...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 if (shouldThrottleRendering()) | 799 if (shouldThrottleRendering()) |
| 799 return; | 800 return; |
| 800 page()->animator().scheduleVisualUpdate(this); | 801 page()->animator().scheduleVisualUpdate(this); |
| 801 } | 802 } |
| 802 | 803 |
| 803 FrameLoaderClient* LocalFrame::client() const | 804 FrameLoaderClient* LocalFrame::client() const |
| 804 { | 805 { |
| 805 return static_cast<FrameLoaderClient*>(Frame::client()); | 806 return static_cast<FrameLoaderClient*>(Frame::client()); |
| 806 } | 807 } |
| 807 | 808 |
| 809 PluginData* LocalFrame::pluginData() const |
| 810 { |
| 811 if (!loader().allowPlugins(NotAboutToInstantiatePlugin)) |
| 812 return nullptr; |
| 813 return page()->pluginData(); |
| 814 } |
| 815 |
| 808 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); | 816 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); |
| 809 | 817 |
| 810 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame) | 818 FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame) |
| 811 : m_frame(&frame) | 819 : m_frame(&frame) |
| 812 { | 820 { |
| 813 m_frame->disableNavigation(); | 821 m_frame->disableNavigation(); |
| 814 } | 822 } |
| 815 | 823 |
| 816 FrameNavigationDisabler::~FrameNavigationDisabler() | 824 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 817 { | 825 { |
| 818 m_frame->enableNavigation(); | 826 m_frame->enableNavigation(); |
| 819 } | 827 } |
| 820 | 828 |
| 821 } // namespace blink | 829 } // namespace blink |
| OLD | NEW |