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

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

Issue 2953503004: Transfer ownership of InputMethodController from LocalFrame to DOMWindow
Patch Set: Created 3 years, 5 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 class DOMWindowEventQueue; 54 class DOMWindowEventQueue;
55 class Element; 55 class Element;
56 class EventQueue; 56 class EventQueue;
57 class ExceptionState; 57 class ExceptionState;
58 class External; 58 class External;
59 class FrameConsole; 59 class FrameConsole;
60 class FrameRequestCallback; 60 class FrameRequestCallback;
61 class History; 61 class History;
62 class IdleRequestCallback; 62 class IdleRequestCallback;
63 class IdleRequestOptions; 63 class IdleRequestOptions;
64 class InputMethodController;
64 class MediaQueryList; 65 class MediaQueryList;
65 class MessageEvent; 66 class MessageEvent;
66 class Navigator; 67 class Navigator;
67 class PostMessageTimer; 68 class PostMessageTimer;
68 class Screen; 69 class Screen;
69 class ScriptState; 70 class ScriptState;
70 class ScrollToOptions; 71 class ScrollToOptions;
71 class SecurityOrigin; 72 class SecurityOrigin;
72 class SerializedScriptValue; 73 class SerializedScriptValue;
73 class SourceLocation; 74 class SourceLocation;
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 // ExecutionContext. 312 // ExecutionContext.
312 void ClearEventQueue(); 313 void ClearEventQueue();
313 314
314 void AcceptLanguagesChanged(); 315 void AcceptLanguagesChanged();
315 316
316 FloatSize GetViewportSize(IncludeScrollbarsInRect) const; 317 FloatSize GetViewportSize(IncludeScrollbarsInRect) const;
317 318
318 void SetHasLoadEventFired() { has_load_event_fired_ = true; } 319 void SetHasLoadEventFired() { has_load_event_fired_ = true; }
319 bool HasLoadEventFired() { return has_load_event_fired_; } 320 bool HasLoadEventFired() { return has_load_event_fired_; }
320 321
322 InputMethodController* GetInputMethodController() const;
323
321 protected: 324 protected:
322 // EventTarget overrides. 325 // EventTarget overrides.
323 void AddedEventListener(const AtomicString& event_type, 326 void AddedEventListener(const AtomicString& event_type,
324 RegisteredEventListener&) override; 327 RegisteredEventListener&) override;
325 void RemovedEventListener(const AtomicString& event_type, 328 void RemovedEventListener(const AtomicString& event_type,
326 const RegisteredEventListener&) override; 329 const RegisteredEventListener&) override;
327 330
328 // Protected DOMWindow overrides. 331 // Protected DOMWindow overrides.
329 void SchedulePostMessage(MessageEvent*, 332 void SchedulePostMessage(MessageEvent*,
330 PassRefPtr<SecurityOrigin> target, 333 PassRefPtr<SecurityOrigin> target,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 String status_; 369 String status_;
367 String default_status_; 370 String default_status_;
368 371
369 mutable Member<ApplicationCache> application_cache_; 372 mutable Member<ApplicationCache> application_cache_;
370 373
371 Member<DOMWindowEventQueue> event_queue_; 374 Member<DOMWindowEventQueue> event_queue_;
372 RefPtr<SerializedScriptValue> pending_state_object_; 375 RefPtr<SerializedScriptValue> pending_state_object_;
373 376
374 HeapHashSet<Member<PostMessageTimer>> post_message_timers_; 377 HeapHashSet<Member<PostMessageTimer>> post_message_timers_;
375 HeapHashSet<WeakMember<EventListenerObserver>> event_listener_observers_; 378 HeapHashSet<WeakMember<EventListenerObserver>> event_listener_observers_;
379
380 const Member<InputMethodController> input_method_controller_;
376 }; 381 };
377 382
378 DEFINE_TYPE_CASTS(LocalDOMWindow, 383 DEFINE_TYPE_CASTS(LocalDOMWindow,
379 DOMWindow, 384 DOMWindow,
380 x, 385 x,
381 x->IsLocalDOMWindow(), 386 x->IsLocalDOMWindow(),
382 x.IsLocalDOMWindow()); 387 x.IsLocalDOMWindow());
383 388
384 inline String LocalDOMWindow::status() const { 389 inline String LocalDOMWindow::status() const {
385 return status_; 390 return status_;
386 } 391 }
387 392
388 inline String LocalDOMWindow::defaultStatus() const { 393 inline String LocalDOMWindow::defaultStatus() const {
389 return default_status_; 394 return default_status_;
390 } 395 }
391 396
397 inline InputMethodController* LocalDOMWindow::GetInputMethodController() const {
398 return input_method_controller_;
399 }
400
392 } // namespace blink 401 } // namespace blink
393 402
394 #endif // LocalDOMWindow_h 403 #endif // LocalDOMWindow_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698