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

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

Issue 2953503004: Transfer ownership of InputMethodController from LocalFrame to DOMWindow
Patch Set: Created 3 years, 6 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) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 26 matching lines...) Expand all
37 #include "core/css/StyleMedia.h" 37 #include "core/css/StyleMedia.h"
38 #include "core/css/resolver/StyleResolver.h" 38 #include "core/css/resolver/StyleResolver.h"
39 #include "core/dom/DOMImplementation.h" 39 #include "core/dom/DOMImplementation.h"
40 #include "core/dom/FrameRequestCallback.h" 40 #include "core/dom/FrameRequestCallback.h"
41 #include "core/dom/SandboxFlags.h" 41 #include "core/dom/SandboxFlags.h"
42 #include "core/dom/SinkDocument.h" 42 #include "core/dom/SinkDocument.h"
43 #include "core/dom/TaskRunnerHelper.h" 43 #include "core/dom/TaskRunnerHelper.h"
44 #include "core/dom/UserGestureIndicator.h" 44 #include "core/dom/UserGestureIndicator.h"
45 #include "core/dom/custom/CustomElementRegistry.h" 45 #include "core/dom/custom/CustomElementRegistry.h"
46 #include "core/editing/Editor.h" 46 #include "core/editing/Editor.h"
47 #include "core/editing/InputMethodController.h"
47 #include "core/events/DOMWindowEventQueue.h" 48 #include "core/events/DOMWindowEventQueue.h"
48 #include "core/events/HashChangeEvent.h" 49 #include "core/events/HashChangeEvent.h"
49 #include "core/events/MessageEvent.h" 50 #include "core/events/MessageEvent.h"
50 #include "core/events/PageTransitionEvent.h" 51 #include "core/events/PageTransitionEvent.h"
51 #include "core/events/PopStateEvent.h" 52 #include "core/events/PopStateEvent.h"
52 #include "core/events/ScopedEventQueue.h" 53 #include "core/events/ScopedEventQueue.h"
53 #include "core/frame/BarProp.h" 54 #include "core/frame/BarProp.h"
54 #include "core/frame/DOMVisualViewport.h" 55 #include "core/frame/DOMVisualViewport.h"
55 #include "core/frame/EventHandlerRegistry.h" 56 #include "core/frame/EventHandlerRegistry.h"
56 #include "core/frame/External.h" 57 #include "core/frame/External.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 } 271 }
271 272
272 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame) 273 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame)
273 : DOMWindow(frame), 274 : DOMWindow(frame),
274 view_(DOMVisualViewport::Create(this)), 275 view_(DOMVisualViewport::Create(this)),
275 unused_preloads_timer_( 276 unused_preloads_timer_(
276 TaskRunnerHelper::Get(TaskType::kUnspecedTimer, &frame), 277 TaskRunnerHelper::Get(TaskType::kUnspecedTimer, &frame),
277 this, 278 this,
278 &LocalDOMWindow::WarnUnusedPreloads), 279 &LocalDOMWindow::WarnUnusedPreloads),
279 should_print_when_finished_loading_(false), 280 should_print_when_finished_loading_(false),
280 custom_elements_(this, nullptr) {} 281 custom_elements_(this, nullptr),
282 input_method_controller_(InputMethodController::Create(frame)) {}
281 283
282 void LocalDOMWindow::ClearDocument() { 284 void LocalDOMWindow::ClearDocument() {
283 if (!document_) 285 if (!document_)
284 return; 286 return;
285 287
286 DCHECK(!document_->IsActive()); 288 DCHECK(!document_->IsActive());
287 289
288 // FIXME: This should be part of SuspendableObject shutdown 290 // FIXME: This should be part of SuspendableObject shutdown
289 ClearEventQueue(); 291 ClearEventQueue();
290 292
(...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after
1655 visitor->Trace(toolbar_); 1657 visitor->Trace(toolbar_);
1656 visitor->Trace(navigator_); 1658 visitor->Trace(navigator_);
1657 visitor->Trace(media_); 1659 visitor->Trace(media_);
1658 visitor->Trace(custom_elements_); 1660 visitor->Trace(custom_elements_);
1659 visitor->Trace(external_); 1661 visitor->Trace(external_);
1660 visitor->Trace(application_cache_); 1662 visitor->Trace(application_cache_);
1661 visitor->Trace(event_queue_); 1663 visitor->Trace(event_queue_);
1662 visitor->Trace(post_message_timers_); 1664 visitor->Trace(post_message_timers_);
1663 visitor->Trace(view_); 1665 visitor->Trace(view_);
1664 visitor->Trace(event_listener_observers_); 1666 visitor->Trace(event_listener_observers_);
1667 visitor->Trace(input_method_controller_);
1665 DOMWindow::Trace(visitor); 1668 DOMWindow::Trace(visitor);
1666 Supplementable<LocalDOMWindow>::Trace(visitor); 1669 Supplementable<LocalDOMWindow>::Trace(visitor);
1667 } 1670 }
1668 1671
1669 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { 1672 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) {
1670 visitor->TraceWrappers(custom_elements_); 1673 visitor->TraceWrappers(custom_elements_);
1671 DOMWindow::TraceWrappers(visitor); 1674 DOMWindow::TraceWrappers(visitor);
1672 } 1675 }
1673 1676
1674 } // namespace blink 1677 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalDOMWindow.h ('k') | third_party/WebKit/Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698