OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) | 4 * (C) 2000 Simon Hausmann (hausmann@kde.org) |
5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "core/html/HTMLFrameElementBase.h" | 25 #include "core/html/HTMLFrameElementBase.h" |
26 | 26 |
27 #include "bindings/core/v8/ScriptController.h" | 27 #include "bindings/core/v8/ScriptController.h" |
28 #include "bindings/core/v8/ScriptEventListener.h" | 28 #include "bindings/core/v8/ScriptEventListener.h" |
29 #include "core/HTMLNames.h" | 29 #include "core/HTMLNames.h" |
30 #include "core/dom/Attribute.h" | 30 #include "core/dom/Attribute.h" |
31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
32 #include "core/frame/FrameView.h" | 32 #include "core/frame/FrameView.h" |
33 #include "core/frame/LocalFrame.h" | 33 #include "core/frame/LocalFrame.h" |
34 #include "core/frame/RemoteFrame.h" | 34 #include "core/frame/RemoteFrame.h" |
| 35 #include "core/frame/RemoteFrameView.h" |
35 #include "core/html/parser/HTMLParserIdioms.h" | 36 #include "core/html/parser/HTMLParserIdioms.h" |
36 #include "core/layout/LayoutPart.h" | 37 #include "core/layout/LayoutPart.h" |
37 #include "core/loader/FrameLoader.h" | 38 #include "core/loader/FrameLoader.h" |
38 #include "core/page/FocusController.h" | 39 #include "core/page/FocusController.h" |
39 #include "core/page/Page.h" | 40 #include "core/page/Page.h" |
40 | 41 |
41 namespace blink { | 42 namespace blink { |
42 | 43 |
43 using namespace HTMLNames; | 44 using namespace HTMLNames; |
44 | 45 |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 } | 164 } |
164 | 165 |
165 void HTMLFrameElementBase::attach(const AttachContext& context) | 166 void HTMLFrameElementBase::attach(const AttachContext& context) |
166 { | 167 { |
167 HTMLFrameOwnerElement::attach(context); | 168 HTMLFrameOwnerElement::attach(context); |
168 | 169 |
169 if (layoutPart()) { | 170 if (layoutPart()) { |
170 if (Frame* frame = contentFrame()) { | 171 if (Frame* frame = contentFrame()) { |
171 if (frame->isLocalFrame()) | 172 if (frame->isLocalFrame()) |
172 setWidget(toLocalFrame(frame)->view()); | 173 setWidget(toLocalFrame(frame)->view()); |
| 174 else if (frame->isRemoteFrame()) |
| 175 setWidget(toRemoteFrame(frame)->view()); |
173 } | 176 } |
174 } | 177 } |
175 } | 178 } |
176 | 179 |
177 void HTMLFrameElementBase::setLocation(const String& str) | 180 void HTMLFrameElementBase::setLocation(const String& str) |
178 { | 181 { |
179 m_URL = AtomicString(str); | 182 m_URL = AtomicString(str); |
180 | 183 |
181 if (inDocument()) | 184 if (inDocument()) |
182 openURL(false); | 185 openURL(false); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 void HTMLFrameElementBase::defaultEventHandler(Event* event) | 222 void HTMLFrameElementBase::defaultEventHandler(Event* event) |
220 { | 223 { |
221 if (contentFrame() && contentFrame()->isRemoteFrame()) { | 224 if (contentFrame() && contentFrame()->isRemoteFrame()) { |
222 toRemoteFrame(contentFrame())->forwardInputEvent(event); | 225 toRemoteFrame(contentFrame())->forwardInputEvent(event); |
223 return; | 226 return; |
224 } | 227 } |
225 HTMLFrameOwnerElement::defaultEventHandler(event); | 228 HTMLFrameOwnerElement::defaultEventHandler(event); |
226 } | 229 } |
227 | 230 |
228 } // namespace blink | 231 } // namespace blink |
OLD | NEW |