Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 class FetchContext; | 48 class FetchContext; |
| 49 class FloatSize; | 49 class FloatSize; |
| 50 class FrameConsole; | 50 class FrameConsole; |
| 51 class FrameDestructionObserver; | 51 class FrameDestructionObserver; |
| 52 class FrameSelection; | 52 class FrameSelection; |
| 53 class FrameView; | 53 class FrameView; |
| 54 class HTMLPlugInElement; | 54 class HTMLPlugInElement; |
| 55 class InputMethodController; | 55 class InputMethodController; |
| 56 class IntPoint; | 56 class IntPoint; |
| 57 class IntSize; | 57 class IntSize; |
| 58 class LocalDOMWindow; | |
| 58 class Node; | 59 class Node; |
| 59 class Range; | 60 class Range; |
| 60 class RenderView; | 61 class RenderView; |
| 61 class TreeScope; | 62 class TreeScope; |
| 62 class ScriptController; | 63 class ScriptController; |
| 63 class SpellChecker; | 64 class SpellChecker; |
| 64 class TreeScope; | 65 class TreeScope; |
| 65 class VisiblePosition; | 66 class VisiblePosition; |
| 66 | 67 |
| 67 class LocalFrame : public Frame, public WillBeHeapSupplementable<LocalFrame> { | 68 class LocalFrame : public Frame, public WillBeHeapSupplementable<LocalFrame> { |
| 68 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalFrame); | 69 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalFrame); |
| 69 public: | 70 public: |
| 70 static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, Fra meHost*, FrameOwner*); | 71 static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, Fra meHost*, FrameOwner*); |
| 71 | 72 |
| 72 void init(); | 73 void init(); |
| 73 void setView(PassRefPtrWillBeRawPtr<FrameView>); | 74 void setView(PassRefPtrWillBeRawPtr<FrameView>); |
| 74 void createView(const IntSize&, const Color&, bool, | 75 void createView(const IntSize&, const Color&, bool, |
| 75 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, | 76 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, |
| 76 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); | 77 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); |
| 77 | 78 |
| 78 // Frame overrides: | 79 // Frame overrides: |
| 79 virtual ~LocalFrame(); | 80 virtual ~LocalFrame(); |
| 80 virtual void trace(Visitor*) override; | 81 virtual void trace(Visitor*) override; |
| 81 virtual bool isLocalFrame() const override { return true; } | 82 virtual bool isLocalFrame() const override { return true; } |
| 82 virtual LocalDOMWindow* domWindow() const override; | 83 virtual DOMWindow* domWindow() const override; |
|
dcheng
2014/10/31 03:20:41
I wanted to make keep this as a covariant return,
| |
| 83 virtual void navigate(Document& originDocument, const KURL&, bool lockBa ckForwardList) override; | 84 virtual void navigate(Document& originDocument, const KURL&, bool lockBa ckForwardList) override; |
| 84 virtual void detach() override; | 85 virtual void detach() override; |
| 85 virtual void disconnectOwnerElement() override; | 86 virtual void disconnectOwnerElement() override; |
| 86 | 87 |
| 87 void addDestructionObserver(FrameDestructionObserver*); | 88 void addDestructionObserver(FrameDestructionObserver*); |
| 88 void removeDestructionObserver(FrameDestructionObserver*); | 89 void removeDestructionObserver(FrameDestructionObserver*); |
| 89 | 90 |
| 90 void willDetachFrameHost(); | 91 void willDetachFrameHost(); |
| 91 | 92 |
| 93 LocalDOMWindow* localDOMWindow() const; | |
| 92 void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>); | 94 void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>); |
| 93 FrameView* view() const; | 95 FrameView* view() const; |
| 94 Document* document() const; | 96 Document* document() const; |
| 95 void setPagePopupOwner(Element&); | 97 void setPagePopupOwner(Element&); |
| 96 Element* pagePopupOwner() const { return m_pagePopupOwner.get(); } | 98 Element* pagePopupOwner() const { return m_pagePopupOwner.get(); } |
| 97 | 99 |
| 98 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame. | 100 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame. |
| 99 | 101 |
| 100 Editor& editor() const; | 102 Editor& editor() const; |
| 101 EventHandler& eventHandler() const; | 103 EventHandler& eventHandler() const; |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 210 float m_textZoomFactor; | 212 float m_textZoomFactor; |
| 211 | 213 |
| 212 bool m_inViewSourceMode; | 214 bool m_inViewSourceMode; |
| 213 }; | 215 }; |
| 214 | 216 |
| 215 inline void LocalFrame::init() | 217 inline void LocalFrame::init() |
| 216 { | 218 { |
| 217 m_loader.init(); | 219 m_loader.init(); |
| 218 } | 220 } |
| 219 | 221 |
| 222 inline LocalDOMWindow* LocalFrame::localDOMWindow() const | |
| 223 { | |
| 224 return m_domWindow.get(); | |
|
haraken
2014/10/31 06:07:04
m_domWindow => m_localDOMWindow
| |
| 225 } | |
| 226 | |
| 220 inline FrameLoader& LocalFrame::loader() const | 227 inline FrameLoader& LocalFrame::loader() const |
| 221 { | 228 { |
| 222 return m_loader; | 229 return m_loader; |
| 223 } | 230 } |
| 224 | 231 |
| 225 inline NavigationScheduler& LocalFrame::navigationScheduler() const | 232 inline NavigationScheduler& LocalFrame::navigationScheduler() const |
| 226 { | 233 { |
| 227 return m_navigationScheduler; | 234 return m_navigationScheduler; |
| 228 } | 235 } |
| 229 | 236 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 281 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); | 288 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); |
| 282 | 289 |
| 283 } // namespace blink | 290 } // namespace blink |
| 284 | 291 |
| 285 // During refactoring, there are some places where we need to do type conversion s that | 292 // During refactoring, there are some places where we need to do type conversion s that |
| 286 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. | 293 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. |
| 287 // At that time this #define will be removed and all the uses of it will need to be corrected. | 294 // At that time this #define will be removed and all the uses of it will need to be corrected. |
| 288 #define toLocalFrameTemporary toLocalFrame | 295 #define toLocalFrameTemporary toLocalFrame |
| 289 | 296 |
| 290 #endif // LocalFrame_h | 297 #endif // LocalFrame_h |
| OLD | NEW |