| 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 | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 9 * rights reserved. | 9 * rights reserved. |
| 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 #include "bindings/core/v8/ScriptController.h" | 35 #include "bindings/core/v8/ScriptController.h" |
| 36 #include "core/CoreProbeSink.h" | 36 #include "core/CoreProbeSink.h" |
| 37 #include "core/dom/ChildFrameDisconnector.h" | 37 #include "core/dom/ChildFrameDisconnector.h" |
| 38 #include "core/dom/DocumentType.h" | 38 #include "core/dom/DocumentType.h" |
| 39 #include "core/dom/StyleChangeReason.h" | 39 #include "core/dom/StyleChangeReason.h" |
| 40 #include "core/editing/EditingUtilities.h" | 40 #include "core/editing/EditingUtilities.h" |
| 41 #include "core/editing/Editor.h" | 41 #include "core/editing/Editor.h" |
| 42 #include "core/editing/FrameSelection.h" | 42 #include "core/editing/FrameSelection.h" |
| 43 #include "core/editing/InputMethodController.h" | 43 #include "core/editing/InputMethodController.h" |
| 44 #include "core/editing/TextSuggestionController.h" |
| 44 #include "core/editing/serializers/Serialization.h" | 45 #include "core/editing/serializers/Serialization.h" |
| 45 #include "core/editing/spellcheck/SpellChecker.h" | 46 #include "core/editing/spellcheck/SpellChecker.h" |
| 46 #include "core/events/Event.h" | 47 #include "core/events/Event.h" |
| 47 #include "core/frame/ContentSettingsClient.h" | 48 #include "core/frame/ContentSettingsClient.h" |
| 48 #include "core/frame/EventHandlerRegistry.h" | 49 #include "core/frame/EventHandlerRegistry.h" |
| 49 #include "core/frame/FrameConsole.h" | 50 #include "core/frame/FrameConsole.h" |
| 50 #include "core/frame/FrameView.h" | 51 #include "core/frame/FrameView.h" |
| 51 #include "core/frame/LocalDOMWindow.h" | 52 #include "core/frame/LocalDOMWindow.h" |
| 52 #include "core/frame/LocalFrameClient.h" | 53 #include "core/frame/LocalFrameClient.h" |
| 53 #include "core/frame/PerformanceMonitor.h" | 54 #include "core/frame/PerformanceMonitor.h" |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 visitor->trace(m_view); | 359 visitor->trace(m_view); |
| 359 visitor->trace(m_domWindow); | 360 visitor->trace(m_domWindow); |
| 360 visitor->trace(m_pagePopupOwner); | 361 visitor->trace(m_pagePopupOwner); |
| 361 visitor->trace(m_script); | 362 visitor->trace(m_script); |
| 362 visitor->trace(m_editor); | 363 visitor->trace(m_editor); |
| 363 visitor->trace(m_spellChecker); | 364 visitor->trace(m_spellChecker); |
| 364 visitor->trace(m_selection); | 365 visitor->trace(m_selection); |
| 365 visitor->trace(m_eventHandler); | 366 visitor->trace(m_eventHandler); |
| 366 visitor->trace(m_console); | 367 visitor->trace(m_console); |
| 367 visitor->trace(m_inputMethodController); | 368 visitor->trace(m_inputMethodController); |
| 369 visitor->trace(m_textSuggestionController); |
| 368 Frame::trace(visitor); | 370 Frame::trace(visitor); |
| 369 Supplementable<LocalFrame>::trace(visitor); | 371 Supplementable<LocalFrame>::trace(visitor); |
| 370 } | 372 } |
| 371 | 373 |
| 372 void LocalFrame::navigate(Document& originDocument, | 374 void LocalFrame::navigate(Document& originDocument, |
| 373 const KURL& url, | 375 const KURL& url, |
| 374 bool replaceCurrentItem, | 376 bool replaceCurrentItem, |
| 375 UserGestureStatus userGestureStatus) { | 377 UserGestureStatus userGestureStatus) { |
| 376 m_navigationScheduler->scheduleLocationChange(&originDocument, url, | 378 m_navigationScheduler->scheduleLocationChange(&originDocument, url, |
| 377 replaceCurrentItem); | 379 replaceCurrentItem); |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 870 m_navigationScheduler(NavigationScheduler::create(this)), | 872 m_navigationScheduler(NavigationScheduler::create(this)), |
| 871 m_script(ScriptController::create( | 873 m_script(ScriptController::create( |
| 872 *this, | 874 *this, |
| 873 *static_cast<LocalWindowProxyManager*>(getWindowProxyManager()))), | 875 *static_cast<LocalWindowProxyManager*>(getWindowProxyManager()))), |
| 874 m_editor(Editor::create(*this)), | 876 m_editor(Editor::create(*this)), |
| 875 m_spellChecker(SpellChecker::create(*this)), | 877 m_spellChecker(SpellChecker::create(*this)), |
| 876 m_selection(FrameSelection::create(*this)), | 878 m_selection(FrameSelection::create(*this)), |
| 877 m_eventHandler(new EventHandler(*this)), | 879 m_eventHandler(new EventHandler(*this)), |
| 878 m_console(FrameConsole::create(*this)), | 880 m_console(FrameConsole::create(*this)), |
| 879 m_inputMethodController(InputMethodController::create(*this)), | 881 m_inputMethodController(InputMethodController::create(*this)), |
| 882 m_textSuggestionController(TextSuggestionController::create(*this)), |
| 880 m_navigationDisableCount(0), | 883 m_navigationDisableCount(0), |
| 881 m_pageZoomFactor(parentPageZoomFactor(this)), | 884 m_pageZoomFactor(parentPageZoomFactor(this)), |
| 882 m_textZoomFactor(parentTextZoomFactor(this)), | 885 m_textZoomFactor(parentTextZoomFactor(this)), |
| 883 m_inViewSourceMode(false), | 886 m_inViewSourceMode(false), |
| 884 m_interfaceProvider(interfaceProvider), | 887 m_interfaceProvider(interfaceProvider), |
| 885 m_interfaceRegistry(interfaceRegistry) { | 888 m_interfaceRegistry(interfaceRegistry) { |
| 886 if (isLocalRoot()) { | 889 if (isLocalRoot()) { |
| 887 m_instrumentingAgents = new CoreProbeSink(); | 890 m_instrumentingAgents = new CoreProbeSink(); |
| 888 m_performanceMonitor = new PerformanceMonitor(this); | 891 m_performanceMonitor = new PerformanceMonitor(this); |
| 889 } else { | 892 } else { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 932 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 935 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 933 m_frame->client()->frameBlameContext()->Enter(); | 936 m_frame->client()->frameBlameContext()->Enter(); |
| 934 } | 937 } |
| 935 | 938 |
| 936 ScopedFrameBlamer::~ScopedFrameBlamer() { | 939 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 937 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 940 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 938 m_frame->client()->frameBlameContext()->Leave(); | 941 m_frame->client()->frameBlameContext()->Leave(); |
| 939 } | 942 } |
| 940 | 943 |
| 941 } // namespace blink | 944 } // namespace blink |
| OLD | NEW |