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

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

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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
9 * reserved. 9 * reserved.
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 Member<LocalFrameView> view_; 297 Member<LocalFrameView> view_;
298 // Usually 0. Non-null if this is the top frame of PagePopup. 298 // Usually 0. Non-null if this is the top frame of PagePopup.
299 Member<Element> page_popup_owner_; 299 Member<Element> page_popup_owner_;
300 300
301 const Member<ScriptController> script_controller_; 301 const Member<ScriptController> script_controller_;
302 const Member<Editor> editor_; 302 const Member<Editor> editor_;
303 const Member<SpellChecker> spell_checker_; 303 const Member<SpellChecker> spell_checker_;
304 const Member<FrameSelection> selection_; 304 const Member<FrameSelection> selection_;
305 const Member<EventHandler> event_handler_; 305 const Member<EventHandler> event_handler_;
306 const Member<FrameConsole> console_; 306 const Member<FrameConsole> console_;
307 const Member<InputMethodController> input_method_controller_;
308 307
309 int navigation_disable_count_; 308 int navigation_disable_count_;
310 309
311 float page_zoom_factor_; 310 float page_zoom_factor_;
312 float text_zoom_factor_; 311 float text_zoom_factor_;
313 312
314 bool in_view_source_mode_; 313 bool in_view_source_mode_;
315 314
316 Member<CoreProbeSink> probe_sink_; 315 Member<CoreProbeSink> probe_sink_;
317 Member<PerformanceMonitor> performance_monitor_; 316 Member<PerformanceMonitor> performance_monitor_;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 } 348 }
350 349
351 inline SpellChecker& LocalFrame::GetSpellChecker() const { 350 inline SpellChecker& LocalFrame::GetSpellChecker() const {
352 return *spell_checker_; 351 return *spell_checker_;
353 } 352 }
354 353
355 inline FrameConsole& LocalFrame::Console() const { 354 inline FrameConsole& LocalFrame::Console() const {
356 return *console_; 355 return *console_;
357 } 356 }
358 357
359 inline InputMethodController& LocalFrame::GetInputMethodController() const {
360 return *input_method_controller_;
361 }
362
363 inline bool LocalFrame::InViewSourceMode() const { 358 inline bool LocalFrame::InViewSourceMode() const {
364 return in_view_source_mode_; 359 return in_view_source_mode_;
365 } 360 }
366 361
367 inline void LocalFrame::SetInViewSourceMode(bool mode) { 362 inline void LocalFrame::SetInViewSourceMode(bool mode) {
368 in_view_source_mode_ = mode; 363 in_view_source_mode_ = mode;
369 } 364 }
370 365
371 inline EventHandler& LocalFrame::GetEventHandler() const { 366 inline EventHandler& LocalFrame::GetEventHandler() const {
372 DCHECK(event_handler_); 367 DCHECK(event_handler_);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 explicit ScopedFrameBlamer(LocalFrame*); 410 explicit ScopedFrameBlamer(LocalFrame*);
416 ~ScopedFrameBlamer(); 411 ~ScopedFrameBlamer();
417 412
418 private: 413 private:
419 Member<LocalFrame> frame_; 414 Member<LocalFrame> frame_;
420 }; 415 };
421 416
422 } // namespace blink 417 } // namespace blink
423 418
424 #endif // LocalFrame_h 419 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp ('k') | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698