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

Side by Side Diff: Source/core/page/Page.h

Issue 634883002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/page (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 | « Source/core/page/NetworkStateNotifierTest.cpp ('k') | Source/core/page/PageLifecycleNotifier.h » ('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, 2008, 2009, 2010, 2013 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 class Settings; 64 class Settings;
65 class SpellCheckerClient; 65 class SpellCheckerClient;
66 class StorageNamespace; 66 class StorageNamespace;
67 class UndoStack; 67 class UndoStack;
68 class ValidationMessageClient; 68 class ValidationMessageClient;
69 69
70 typedef uint64_t LinkHash; 70 typedef uint64_t LinkHash;
71 71
72 float deviceScaleFactor(LocalFrame*); 72 float deviceScaleFactor(LocalFrame*);
73 73
74 class Page FINAL : public NoBaseWillBeGarbageCollectedFinalized<Page>, public Wi llBeHeapSupplementable<Page>, public LifecycleContext<Page>, public SettingsDele gate { 74 class Page final : public NoBaseWillBeGarbageCollectedFinalized<Page>, public Wi llBeHeapSupplementable<Page>, public LifecycleContext<Page>, public SettingsDele gate {
75 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Page); 75 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Page);
76 WTF_MAKE_NONCOPYABLE(Page); 76 WTF_MAKE_NONCOPYABLE(Page);
77 friend class Settings; 77 friend class Settings;
78 public: 78 public:
79 static void scheduleForcedStyleRecalcForAllPages(); 79 static void scheduleForcedStyleRecalcForAllPages();
80 80
81 // It is up to the platform to ensure that non-null clients are provided whe re required. 81 // It is up to the platform to ensure that non-null clients are provided whe re required.
82 struct PageClients { 82 struct PageClients {
83 WTF_MAKE_NONCOPYABLE(PageClients); WTF_MAKE_FAST_ALLOCATED; 83 WTF_MAKE_NONCOPYABLE(PageClients); WTF_MAKE_FAST_ALLOCATED;
84 public: 84 public:
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 void checkSubframeCountConsistency() const; 232 void checkSubframeCountConsistency() const;
233 #else 233 #else
234 void checkSubframeCountConsistency() const { } 234 void checkSubframeCountConsistency() const { }
235 #endif 235 #endif
236 236
237 void setTimerAlignmentInterval(double); 237 void setTimerAlignmentInterval(double);
238 238
239 void setNeedsLayoutInAllFrames(); 239 void setNeedsLayoutInAllFrames();
240 240
241 // SettingsDelegate overrides. 241 // SettingsDelegate overrides.
242 virtual void settingsChanged(SettingsDelegate::ChangeType) OVERRIDE; 242 virtual void settingsChanged(SettingsDelegate::ChangeType) override;
243 243
244 PageAnimator m_animator; 244 PageAnimator m_animator;
245 const OwnPtr<AutoscrollController> m_autoscrollController; 245 const OwnPtr<AutoscrollController> m_autoscrollController;
246 const OwnPtr<Chrome> m_chrome; 246 const OwnPtr<Chrome> m_chrome;
247 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController; 247 const OwnPtrWillBeMember<DragCaretController> m_dragCaretController;
248 const OwnPtrWillBeMember<DragController> m_dragController; 248 const OwnPtrWillBeMember<DragController> m_dragController;
249 const OwnPtrWillBeMember<FocusController> m_focusController; 249 const OwnPtrWillBeMember<FocusController> m_focusController;
250 const OwnPtrWillBeMember<ContextMenuController> m_contextMenuController; 250 const OwnPtrWillBeMember<ContextMenuController> m_contextMenuController;
251 const OwnPtrWillBeMember<InspectorController> m_inspectorController; 251 const OwnPtrWillBeMember<InspectorController> m_inspectorController;
252 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController; 252 const OwnPtrWillBeMember<PointerLockController> m_pointerLockController;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers; 300 WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_m ultisamplingChangedObservers;
301 301
302 // A pointer to all the interfaces provided to in-process Frames for this Pa ge. 302 // A pointer to all the interfaces provided to in-process Frames for this Pa ge.
303 // FIXME: Most of the members of Page should move onto FrameHost. 303 // FIXME: Most of the members of Page should move onto FrameHost.
304 OwnPtrWillBeMember<FrameHost> m_frameHost; 304 OwnPtrWillBeMember<FrameHost> m_frameHost;
305 }; 305 };
306 306
307 } // namespace blink 307 } // namespace blink
308 308
309 #endif // Page_h 309 #endif // Page_h
OLDNEW
« no previous file with comments | « Source/core/page/NetworkStateNotifierTest.cpp ('k') | Source/core/page/PageLifecycleNotifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698