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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 #include "core/inspector/InstrumentingAgents.h" | 54 #include "core/inspector/InstrumentingAgents.h" |
| 55 #include "core/layout/HitTestResult.h" | 55 #include "core/layout/HitTestResult.h" |
| 56 #include "core/layout/LayoutView.h" | 56 #include "core/layout/LayoutView.h" |
| 57 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" | 57 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" |
| 58 #include "core/loader/FrameLoadRequest.h" | 58 #include "core/loader/FrameLoadRequest.h" |
| 59 #include "core/loader/FrameLoaderClient.h" | 59 #include "core/loader/FrameLoaderClient.h" |
| 60 #include "core/loader/NavigationScheduler.h" | 60 #include "core/loader/NavigationScheduler.h" |
| 61 #include "core/page/FocusController.h" | 61 #include "core/page/FocusController.h" |
| 62 #include "core/page/Page.h" | 62 #include "core/page/Page.h" |
| 63 #include "core/page/scrolling/ScrollingCoordinator.h" | 63 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 64 #include "core/page/scrolling/SnapCoordinator.h" | |
| 64 #include "core/paint/DeprecatedPaintLayer.h" | 65 #include "core/paint/DeprecatedPaintLayer.h" |
| 65 #include "core/paint/TransformRecorder.h" | 66 #include "core/paint/TransformRecorder.h" |
| 66 #include "core/svg/SVGDocumentExtensions.h" | 67 #include "core/svg/SVGDocumentExtensions.h" |
| 67 #include "platform/DragImage.h" | 68 #include "platform/DragImage.h" |
| 68 #include "platform/PluginScriptForbiddenScope.h" | 69 #include "platform/PluginScriptForbiddenScope.h" |
| 69 #include "platform/RuntimeEnabledFeatures.h" | 70 #include "platform/RuntimeEnabledFeatures.h" |
| 70 #include "platform/ScriptForbiddenScope.h" | 71 #include "platform/ScriptForbiddenScope.h" |
| 71 #include "platform/graphics/GraphicsContext.h" | 72 #include "platform/graphics/GraphicsContext.h" |
| 72 #include "platform/graphics/StaticBitmapImage.h" | 73 #include "platform/graphics/StaticBitmapImage.h" |
| 73 #include "platform/graphics/paint/ClipRecorder.h" | 74 #include "platform/graphics/paint/ClipRecorder.h" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 210 visitor->trace(m_view); | 211 visitor->trace(m_view); |
| 211 visitor->trace(m_domWindow); | 212 visitor->trace(m_domWindow); |
| 212 visitor->trace(m_pagePopupOwner); | 213 visitor->trace(m_pagePopupOwner); |
| 213 visitor->trace(m_script); | 214 visitor->trace(m_script); |
| 214 visitor->trace(m_editor); | 215 visitor->trace(m_editor); |
| 215 visitor->trace(m_spellChecker); | 216 visitor->trace(m_spellChecker); |
| 216 visitor->trace(m_selection); | 217 visitor->trace(m_selection); |
| 217 visitor->trace(m_eventHandler); | 218 visitor->trace(m_eventHandler); |
| 218 visitor->trace(m_console); | 219 visitor->trace(m_console); |
| 219 visitor->trace(m_inputMethodController); | 220 visitor->trace(m_inputMethodController); |
| 221 visitor->trace(m_snapCoordinator); | |
| 220 visitor->template registerWeakMembers<LocalFrame, &LocalFrame::clearWeakMemb ers>(this); | 222 visitor->template registerWeakMembers<LocalFrame, &LocalFrame::clearWeakMemb ers>(this); |
| 221 HeapSupplementable<LocalFrame>::trace(visitor); | 223 HeapSupplementable<LocalFrame>::trace(visitor); |
| 222 #endif | 224 #endif |
| 223 LocalFrameLifecycleNotifier::trace(visitor); | 225 LocalFrameLifecycleNotifier::trace(visitor); |
| 224 Frame::trace(visitor); | 226 Frame::trace(visitor); |
| 225 } | 227 } |
| 226 | 228 |
| 227 DOMWindow* LocalFrame::domWindow() const | 229 DOMWindow* LocalFrame::domWindow() const |
| 228 { | 230 { |
| 229 return m_domWindow.get(); | 231 return m_domWindow.get(); |
| (...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 845 , m_editor(Editor::create(*this)) | 847 , m_editor(Editor::create(*this)) |
| 846 , m_spellChecker(SpellChecker::create(*this)) | 848 , m_spellChecker(SpellChecker::create(*this)) |
| 847 , m_selection(FrameSelection::create(this)) | 849 , m_selection(FrameSelection::create(this)) |
| 848 , m_eventHandler(adoptPtrWillBeNoop(new EventHandler(this))) | 850 , m_eventHandler(adoptPtrWillBeNoop(new EventHandler(this))) |
| 849 , m_console(FrameConsole::create(*this)) | 851 , m_console(FrameConsole::create(*this)) |
| 850 , m_inputMethodController(InputMethodController::create(*this)) | 852 , m_inputMethodController(InputMethodController::create(*this)) |
| 851 , m_pageZoomFactor(parentPageZoomFactor(this)) | 853 , m_pageZoomFactor(parentPageZoomFactor(this)) |
| 852 , m_textZoomFactor(parentTextZoomFactor(this)) | 854 , m_textZoomFactor(parentTextZoomFactor(this)) |
| 853 , m_inViewSourceMode(false) | 855 , m_inViewSourceMode(false) |
| 854 { | 856 { |
| 857 if (RuntimeEnabledFeatures::cssScrollSnapPointsEnabled()) | |
| 858 m_snapCoordinator = SnapCoordinator::create(*this); | |
|
esprehn
2015/09/24 17:37:41
This should be on FrameView.
majidvp
2015/10/15 21:47:02
Following your other comment I moved it to documen
| |
| 859 | |
| 855 if (isLocalRoot()) | 860 if (isLocalRoot()) |
| 856 m_instrumentingAgents = InstrumentingAgents::create(); | 861 m_instrumentingAgents = InstrumentingAgents::create(); |
| 857 else | 862 else |
| 858 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 863 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 859 } | 864 } |
| 860 | 865 |
| 861 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); | 866 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); |
| 862 | 867 |
| 863 } // namespace blink | 868 } // namespace blink |
| OLD | NEW |