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

Side by Side Diff: Source/core/html/HTMLFrameOwnerElement.h

Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Missed a null check Created 6 years, 9 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/html/HTMLFrameElementBase.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.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, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 11 matching lines...) Expand all
22 #define HTMLFrameOwnerElement_h 22 #define HTMLFrameOwnerElement_h
23 23
24 #include "core/html/HTMLElement.h" 24 #include "core/html/HTMLElement.h"
25 #include "core/svg/SVGDocument.h" 25 #include "core/svg/SVGDocument.h"
26 #include "wtf/HashCountedSet.h" 26 #include "wtf/HashCountedSet.h"
27 27
28 namespace WebCore { 28 namespace WebCore {
29 29
30 class DOMWindow; 30 class DOMWindow;
31 class ExceptionState; 31 class ExceptionState;
32 class LocalFrame; 32 class Frame;
33 class RenderPart; 33 class RenderPart;
34 34
35 class HTMLFrameOwnerElement : public HTMLElement { 35 class HTMLFrameOwnerElement : public HTMLElement {
36 public: 36 public:
37 virtual ~HTMLFrameOwnerElement(); 37 virtual ~HTMLFrameOwnerElement();
38 38
39 LocalFrame* contentFrame() const { return m_contentFrame; } 39 Frame* contentFrame() const { return m_contentFrame; }
40 DOMWindow* contentWindow() const; 40 DOMWindow* contentWindow() const;
41 Document* contentDocument() const; 41 Document* contentDocument() const;
42 42
43 void setContentFrame(LocalFrame&); 43 void setContentFrame(Frame&);
44 void clearContentFrame(); 44 void clearContentFrame();
45 45
46 void disconnectContentFrame(); 46 void disconnectContentFrame();
47 47
48 // Most subclasses use RenderPart (either RenderEmbeddedObject or RenderIFra me) 48 // Most subclasses use RenderPart (either RenderEmbeddedObject or RenderIFra me)
49 // except for HTMLObjectElement and HTMLEmbedElement which may return any 49 // except for HTMLObjectElement and HTMLEmbedElement which may return any
50 // RenderObject when using fallback content. 50 // RenderObject when using fallback content.
51 RenderPart* renderPart() const; 51 RenderPart* renderPart() const;
52 52
53 SVGDocument* getSVGDocument(ExceptionState&) const; 53 SVGDocument* getSVGDocument(ExceptionState&) const;
(...skipping 12 matching lines...) Expand all
66 protected: 66 protected:
67 HTMLFrameOwnerElement(const QualifiedName& tagName, Document&); 67 HTMLFrameOwnerElement(const QualifiedName& tagName, Document&);
68 void setSandboxFlags(SandboxFlags); 68 void setSandboxFlags(SandboxFlags);
69 69
70 bool loadOrRedirectSubframe(const KURL&, const AtomicString& frameName, bool lockBackForwardList); 70 bool loadOrRedirectSubframe(const KURL&, const AtomicString& frameName, bool lockBackForwardList);
71 71
72 private: 72 private:
73 virtual bool isKeyboardFocusable() const OVERRIDE; 73 virtual bool isKeyboardFocusable() const OVERRIDE;
74 virtual bool isFrameOwnerElement() const OVERRIDE FINAL { return true; } 74 virtual bool isFrameOwnerElement() const OVERRIDE FINAL { return true; }
75 75
76 LocalFrame* m_contentFrame; 76 Frame* m_contentFrame;
77 SandboxFlags m_sandboxFlags; 77 SandboxFlags m_sandboxFlags;
78 }; 78 };
79 79
80 DEFINE_ELEMENT_TYPE_CASTS(HTMLFrameOwnerElement, isFrameOwnerElement()); 80 DEFINE_ELEMENT_TYPE_CASTS(HTMLFrameOwnerElement, isFrameOwnerElement());
81 81
82 class SubframeLoadingDisabler { 82 class SubframeLoadingDisabler {
83 public: 83 public:
84 explicit SubframeLoadingDisabler(Node& root) 84 explicit SubframeLoadingDisabler(Node& root)
85 : m_root(root) 85 : m_root(root)
86 { 86 {
(...skipping 22 matching lines...) Expand all
109 DEFINE_STATIC_LOCAL(HashCountedSet<Node*>, nodes, ()); 109 DEFINE_STATIC_LOCAL(HashCountedSet<Node*>, nodes, ());
110 return nodes; 110 return nodes;
111 } 111 }
112 112
113 Node& m_root; 113 Node& m_root;
114 }; 114 };
115 115
116 } // namespace WebCore 116 } // namespace WebCore
117 117
118 #endif // HTMLFrameOwnerElement_h 118 #endif // HTMLFrameOwnerElement_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameElementBase.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698