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

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

Issue 15820002: Page::chrome() should return a reference. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/page/FrameView.cpp ('k') | Source/core/page/PageConsole.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, 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 { 149 {
150 if (!m_group) 150 if (!m_group)
151 setGroupType(PrivatePageGroup); 151 setGroupType(PrivatePageGroup);
152 return *m_group; 152 return *m_group;
153 } 153 }
154 154
155 void incrementSubframeCount() { ++m_subframeCount; } 155 void incrementSubframeCount() { ++m_subframeCount; }
156 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; } 156 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; }
157 int subframeCount() const { checkSubframeCountConsistency(); return m_subfra meCount; } 157 int subframeCount() const { checkSubframeCountConsistency(); return m_subfra meCount; }
158 158
159 Chrome* chrome() const { return m_chrome.get(); } 159 Chrome& chrome() const { return *m_chrome; }
160 DragCaretController* dragCaretController() const { return m_dragCaretControl ler.get(); } 160 DragCaretController* dragCaretController() const { return m_dragCaretControl ler.get(); }
161 DragController* dragController() const { return m_dragController.get(); } 161 DragController* dragController() const { return m_dragController.get(); }
162 FocusController* focusController() const { return m_focusController.get(); } 162 FocusController* focusController() const { return m_focusController.get(); }
163 ContextMenuController* contextMenuController() const { return m_contextMenuC ontroller.get(); } 163 ContextMenuController* contextMenuController() const { return m_contextMenuC ontroller.get(); }
164 InspectorController* inspectorController() const { return m_inspectorControl ler.get(); } 164 InspectorController* inspectorController() const { return m_inspectorControl ler.get(); }
165 PointerLockController* pointerLockController() const { return m_pointerLockC ontroller.get(); } 165 PointerLockController* pointerLockController() const { return m_pointerLockC ontroller.get(); }
166 ValidationMessageClient* validationMessageClient() const { return m_validati onMessageClient; } 166 ValidationMessageClient* validationMessageClient() const { return m_validati onMessageClient; }
167 void setValidationMessageClient(ValidationMessageClient* client) { m_validat ionMessageClient = client; } 167 void setValidationMessageClient(ValidationMessageClient* client) { m_validat ionMessageClient = client; }
168 168
169 ScrollingCoordinator* scrollingCoordinator(); 169 ScrollingCoordinator* scrollingCoordinator();
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 329
330 HashSet<RenderObject*> m_relevantUnpaintedRenderObjects; 330 HashSet<RenderObject*> m_relevantUnpaintedRenderObjects;
331 Region m_topRelevantPaintedRegion; 331 Region m_topRelevantPaintedRegion;
332 Region m_bottomRelevantPaintedRegion; 332 Region m_bottomRelevantPaintedRegion;
333 Region m_relevantUnpaintedRegion; 333 Region m_relevantUnpaintedRegion;
334 bool m_isCountingRelevantRepaintedObjects; 334 bool m_isCountingRelevantRepaintedObjects;
335 #ifndef NDEBUG 335 #ifndef NDEBUG
336 bool m_isPainting; 336 bool m_isPainting;
337 #endif 337 #endif
338 338
339 OwnPtr<PageConsole> m_console; 339 const OwnPtr<PageConsole> m_console;
340 340
341 HashSet<MultisamplingChangedObserver*> m_multisamplingChangedObservers; 341 HashSet<MultisamplingChangedObserver*> m_multisamplingChangedObservers;
342 }; 342 };
343 343
344 } // namespace WebCore 344 } // namespace WebCore
345 345
346 #endif // Page_h 346 #endif // Page_h
OLDNEW
« no previous file with comments | « Source/core/page/FrameView.cpp ('k') | Source/core/page/PageConsole.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698