| 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 26 matching lines...) Expand all Loading... |
| 37 #include "core/editing/InputMethodController.h" | 37 #include "core/editing/InputMethodController.h" |
| 38 #include "core/editing/serializers/Serialization.h" | 38 #include "core/editing/serializers/Serialization.h" |
| 39 #include "core/editing/spellcheck/SpellChecker.h" | 39 #include "core/editing/spellcheck/SpellChecker.h" |
| 40 #include "core/events/Event.h" | 40 #include "core/events/Event.h" |
| 41 #include "core/fetch/ResourceFetcher.h" | 41 #include "core/fetch/ResourceFetcher.h" |
| 42 #include "core/frame/EventHandlerRegistry.h" | 42 #include "core/frame/EventHandlerRegistry.h" |
| 43 #include "core/frame/FrameConsole.h" | 43 #include "core/frame/FrameConsole.h" |
| 44 #include "core/frame/FrameHost.h" | 44 #include "core/frame/FrameHost.h" |
| 45 #include "core/frame/FrameView.h" | 45 #include "core/frame/FrameView.h" |
| 46 #include "core/frame/LocalDOMWindow.h" | 46 #include "core/frame/LocalDOMWindow.h" |
| 47 #include "core/frame/RemoteFrame.h" |
| 47 #include "core/frame/Settings.h" | 48 #include "core/frame/Settings.h" |
| 48 #include "core/html/HTMLFrameElementBase.h" | 49 #include "core/html/HTMLFrameElementBase.h" |
| 49 #include "core/html/HTMLPlugInElement.h" | 50 #include "core/html/HTMLPlugInElement.h" |
| 50 #include "core/input/EventHandler.h" | 51 #include "core/input/EventHandler.h" |
| 51 #include "core/inspector/ConsoleMessageStorage.h" | 52 #include "core/inspector/ConsoleMessageStorage.h" |
| 52 #include "core/inspector/InspectorInstrumentation.h" | 53 #include "core/inspector/InspectorInstrumentation.h" |
| 53 #include "core/inspector/InstrumentingAgents.h" | 54 #include "core/inspector/InstrumentingAgents.h" |
| 54 #include "core/layout/HitTestResult.h" | 55 #include "core/layout/HitTestResult.h" |
| 55 #include "core/layout/LayoutView.h" | 56 #include "core/layout/LayoutView.h" |
| 56 #include "core/layout/compositing/PaintLayerCompositor.h" | 57 #include "core/layout/compositing/PaintLayerCompositor.h" |
| (...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 { | 857 { |
| 857 if (isLocalRoot()) | 858 if (isLocalRoot()) |
| 858 m_instrumentingAgents = InstrumentingAgents::create(); | 859 m_instrumentingAgents = InstrumentingAgents::create(); |
| 859 else | 860 else |
| 860 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 861 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 861 } | 862 } |
| 862 | 863 |
| 863 WebFrameScheduler* LocalFrame::frameScheduler() | 864 WebFrameScheduler* LocalFrame::frameScheduler() |
| 864 { | 865 { |
| 865 if (!m_frameScheduler.get()) | 866 if (!m_frameScheduler.get()) |
| 866 m_frameScheduler = page()->chromeClient().createFrameScheduler(); | 867 m_frameScheduler = page()->chromeClient().createFrameScheduler(client()-
>frameBlameContext()); |
| 867 | 868 |
| 868 ASSERT(m_frameScheduler.get()); | 869 ASSERT(m_frameScheduler.get()); |
| 869 return m_frameScheduler.get(); | 870 return m_frameScheduler.get(); |
| 870 } | 871 } |
| 871 | 872 |
| 872 void LocalFrame::scheduleVisualUpdateUnlessThrottled() | 873 void LocalFrame::scheduleVisualUpdateUnlessThrottled() |
| 873 { | 874 { |
| 874 if (shouldThrottleRendering()) | 875 if (shouldThrottleRendering()) |
| 875 return; | 876 return; |
| 876 page()->animator().scheduleVisualUpdate(this); | 877 page()->animator().scheduleVisualUpdate(this); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 889 { | 890 { |
| 890 m_frame->disableNavigation(); | 891 m_frame->disableNavigation(); |
| 891 } | 892 } |
| 892 | 893 |
| 893 FrameNavigationDisabler::~FrameNavigationDisabler() | 894 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 894 { | 895 { |
| 895 m_frame->enableNavigation(); | 896 m_frame->enableNavigation(); |
| 896 } | 897 } |
| 897 | 898 |
| 898 } // namespace blink | 899 } // namespace blink |
| OLD | NEW |