Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2714113003: Move ownership of IdleSpellCheckCallback from LocalFrame to SpellChecker (Closed)
Patch Set: Fri Feb 24 11:06:25 PST 2017 Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 24 matching lines...) Expand all
35 #include "bindings/core/v8/ScriptController.h" 35 #include "bindings/core/v8/ScriptController.h"
36 #include "core/InstrumentingAgents.h" 36 #include "core/InstrumentingAgents.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/serializers/Serialization.h" 44 #include "core/editing/serializers/Serialization.h"
45 #include "core/editing/spellcheck/IdleSpellCheckCallback.h"
46 #include "core/editing/spellcheck/SpellChecker.h" 45 #include "core/editing/spellcheck/SpellChecker.h"
47 #include "core/events/Event.h" 46 #include "core/events/Event.h"
48 #include "core/frame/EventHandlerRegistry.h" 47 #include "core/frame/EventHandlerRegistry.h"
49 #include "core/frame/FrameConsole.h" 48 #include "core/frame/FrameConsole.h"
50 #include "core/frame/FrameHost.h" 49 #include "core/frame/FrameHost.h"
51 #include "core/frame/FrameView.h" 50 #include "core/frame/FrameView.h"
52 #include "core/frame/LocalDOMWindow.h" 51 #include "core/frame/LocalDOMWindow.h"
53 #include "core/frame/PerformanceMonitor.h" 52 #include "core/frame/PerformanceMonitor.h"
54 #include "core/frame/Settings.h" 53 #include "core/frame/Settings.h"
55 #include "core/frame/VisualViewport.h" 54 #include "core/frame/VisualViewport.h"
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 visitor->trace(m_view); 350 visitor->trace(m_view);
352 visitor->trace(m_domWindow); 351 visitor->trace(m_domWindow);
353 visitor->trace(m_pagePopupOwner); 352 visitor->trace(m_pagePopupOwner);
354 visitor->trace(m_script); 353 visitor->trace(m_script);
355 visitor->trace(m_editor); 354 visitor->trace(m_editor);
356 visitor->trace(m_spellChecker); 355 visitor->trace(m_spellChecker);
357 visitor->trace(m_selection); 356 visitor->trace(m_selection);
358 visitor->trace(m_eventHandler); 357 visitor->trace(m_eventHandler);
359 visitor->trace(m_console); 358 visitor->trace(m_console);
360 visitor->trace(m_inputMethodController); 359 visitor->trace(m_inputMethodController);
361 visitor->trace(m_idleSpellCheckCallback);
362 Frame::trace(visitor); 360 Frame::trace(visitor);
363 Supplementable<LocalFrame>::trace(visitor); 361 Supplementable<LocalFrame>::trace(visitor);
364 } 362 }
365 363
366 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) { 364 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) {
367 return m_script->windowProxy(world); 365 return m_script->windowProxy(world);
368 } 366 }
369 367
370 void LocalFrame::navigate(Document& originDocument, 368 void LocalFrame::navigate(Document& originDocument,
371 const KURL& url, 369 const KURL& url,
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 client->frameBlameContext())), 856 client->frameBlameContext())),
859 m_loader(this), 857 m_loader(this),
860 m_navigationScheduler(NavigationScheduler::create(this)), 858 m_navigationScheduler(NavigationScheduler::create(this)),
861 m_script(ScriptController::create(this)), 859 m_script(ScriptController::create(this)),
862 m_editor(Editor::create(*this)), 860 m_editor(Editor::create(*this)),
863 m_spellChecker(SpellChecker::create(*this)), 861 m_spellChecker(SpellChecker::create(*this)),
864 m_selection(FrameSelection::create(*this)), 862 m_selection(FrameSelection::create(*this)),
865 m_eventHandler(new EventHandler(*this)), 863 m_eventHandler(new EventHandler(*this)),
866 m_console(FrameConsole::create(*this)), 864 m_console(FrameConsole::create(*this)),
867 m_inputMethodController(InputMethodController::create(*this)), 865 m_inputMethodController(InputMethodController::create(*this)),
868 m_idleSpellCheckCallback(IdleSpellCheckCallback::create(*this)),
869 m_navigationDisableCount(0), 866 m_navigationDisableCount(0),
870 m_pageZoomFactor(parentPageZoomFactor(this)), 867 m_pageZoomFactor(parentPageZoomFactor(this)),
871 m_textZoomFactor(parentTextZoomFactor(this)), 868 m_textZoomFactor(parentTextZoomFactor(this)),
872 m_inViewSourceMode(false), 869 m_inViewSourceMode(false),
873 m_interfaceProvider(interfaceProvider), 870 m_interfaceProvider(interfaceProvider),
874 m_interfaceRegistry(interfaceRegistry) { 871 m_interfaceRegistry(interfaceRegistry) {
875 if (isLocalRoot()) { 872 if (isLocalRoot()) {
876 m_instrumentingAgents = new InstrumentingAgents(); 873 m_instrumentingAgents = new InstrumentingAgents();
877 m_performanceMonitor = new PerformanceMonitor(this); 874 m_performanceMonitor = new PerformanceMonitor(this);
878 } else { 875 } else {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 914 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
918 m_frame->client()->frameBlameContext()->Enter(); 915 m_frame->client()->frameBlameContext()->Enter();
919 } 916 }
920 917
921 ScopedFrameBlamer::~ScopedFrameBlamer() { 918 ScopedFrameBlamer::~ScopedFrameBlamer() {
922 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 919 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
923 m_frame->client()->frameBlameContext()->Leave(); 920 m_frame->client()->frameBlameContext()->Leave();
924 } 921 }
925 922
926 } // namespace blink 923 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/testing/Internals.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698