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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge. Created 4 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 reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
(...skipping 23 matching lines...) Expand all
34 #include "core/frame/LocalFrameLifecycleNotifier.h" 34 #include "core/frame/LocalFrameLifecycleNotifier.h"
35 #include "core/frame/LocalFrameLifecycleObserver.h" 35 #include "core/frame/LocalFrameLifecycleObserver.h"
36 #include "core/loader/FrameLoader.h" 36 #include "core/loader/FrameLoader.h"
37 #include "core/page/FrameTree.h" 37 #include "core/page/FrameTree.h"
38 #include "core/paint/PaintPhase.h" 38 #include "core/paint/PaintPhase.h"
39 #include "platform/Supplementable.h" 39 #include "platform/Supplementable.h"
40 #include "platform/graphics/ImageOrientation.h" 40 #include "platform/graphics/ImageOrientation.h"
41 #include "platform/heap/Handle.h" 41 #include "platform/heap/Handle.h"
42 #include "platform/scroll/ScrollTypes.h" 42 #include "platform/scroll/ScrollTypes.h"
43 #include "wtf/HashSet.h" 43 #include "wtf/HashSet.h"
44 #include <memory>
44 45
45 namespace blink { 46 namespace blink {
46 47
47 class Color; 48 class Color;
48 class Document; 49 class Document;
49 class DragImage; 50 class DragImage;
50 class Editor; 51 class Editor;
51 template <typename Traversal> class EditingAlgorithm; 52 template <typename Traversal> class EditingAlgorithm;
52 class Element; 53 class Element;
53 template <typename Strategy> class EphemeralRangeTemplate; 54 template <typename Strategy> class EphemeralRangeTemplate;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 147
147 void setPageZoomFactor(float); 148 void setPageZoomFactor(float);
148 float pageZoomFactor() const { return m_pageZoomFactor; } 149 float pageZoomFactor() const { return m_pageZoomFactor; }
149 void setTextZoomFactor(float); 150 void setTextZoomFactor(float);
150 float textZoomFactor() const { return m_textZoomFactor; } 151 float textZoomFactor() const { return m_textZoomFactor; }
151 void setPageAndTextZoomFactors(float pageZoomFactor, float textZoomFactor); 152 void setPageAndTextZoomFactors(float pageZoomFactor, float textZoomFactor);
152 153
153 void deviceScaleFactorChanged(); 154 void deviceScaleFactorChanged();
154 double devicePixelRatio() const; 155 double devicePixelRatio() const;
155 156
156 PassOwnPtr<DragImage> nodeImage(Node&); 157 std::unique_ptr<DragImage> nodeImage(Node&);
157 PassOwnPtr<DragImage> dragImageForSelection(float opacity); 158 std::unique_ptr<DragImage> dragImageForSelection(float opacity);
158 159
159 String selectedText() const; 160 String selectedText() const;
160 String selectedTextForClipboard() const; 161 String selectedTextForClipboard() const;
161 162
162 PositionWithAffinityTemplate<EditingAlgorithm<NodeTraversal>> positionForPoi nt(const IntPoint& framePoint); 163 PositionWithAffinityTemplate<EditingAlgorithm<NodeTraversal>> positionForPoi nt(const IntPoint& framePoint);
163 Document* documentAtPoint(const IntPoint&); 164 Document* documentAtPoint(const IntPoint&);
164 EphemeralRangeTemplate<EditingAlgorithm<NodeTraversal>> rangeForPoint(const IntPoint& framePoint); 165 EphemeralRangeTemplate<EditingAlgorithm<NodeTraversal>> rangeForPoint(const IntPoint& framePoint);
165 166
166 bool isURLAllowed(const KURL&) const; 167 bool isURLAllowed(const KURL&) const;
167 bool shouldReuseDefaultView(const KURL&) const; 168 bool shouldReuseDefaultView(const KURL&) const;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 // Usually 0. Non-null if this is the top frame of PagePopup. 205 // Usually 0. Non-null if this is the top frame of PagePopup.
205 Member<Element> m_pagePopupOwner; 206 Member<Element> m_pagePopupOwner;
206 207
207 const Member<ScriptController> m_script; 208 const Member<ScriptController> m_script;
208 const Member<Editor> m_editor; 209 const Member<Editor> m_editor;
209 const Member<SpellChecker> m_spellChecker; 210 const Member<SpellChecker> m_spellChecker;
210 const Member<FrameSelection> m_selection; 211 const Member<FrameSelection> m_selection;
211 const Member<EventHandler> m_eventHandler; 212 const Member<EventHandler> m_eventHandler;
212 const Member<FrameConsole> m_console; 213 const Member<FrameConsole> m_console;
213 const Member<InputMethodController> m_inputMethodController; 214 const Member<InputMethodController> m_inputMethodController;
214 OwnPtr<WebFrameScheduler> m_frameScheduler; 215 std::unique_ptr<WebFrameScheduler> m_frameScheduler;
215 216
216 int m_navigationDisableCount; 217 int m_navigationDisableCount;
217 218
218 float m_pageZoomFactor; 219 float m_pageZoomFactor;
219 float m_textZoomFactor; 220 float m_textZoomFactor;
220 221
221 bool m_inViewSourceMode; 222 bool m_inViewSourceMode;
222 223
223 Member<InstrumentingAgents> m_instrumentingAgents; 224 Member<InstrumentingAgents> m_instrumentingAgents;
224 225
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 explicit ScopedFrameBlamer(LocalFrame*); 333 explicit ScopedFrameBlamer(LocalFrame*);
333 ~ScopedFrameBlamer(); 334 ~ScopedFrameBlamer();
334 335
335 private: 336 private:
336 Member<LocalFrame> m_frame; 337 Member<LocalFrame> m_frame;
337 }; 338 };
338 339
339 } // namespace blink 340 } // namespace blink
340 341
341 #endif // LocalFrame_h 342 #endif // LocalFrame_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698