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

Side by Side Diff: Source/core/html/HTMLFrameElementBase.cpp

Issue 931003002: Move and rename RenderPart to LayoutPart. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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/HTMLEmbedElement.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.h » ('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) 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 15 matching lines...) Expand all
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/html/parser/HTMLParserIdioms.h" 35 #include "core/html/parser/HTMLParserIdioms.h"
36 #include "core/layout/LayoutPart.h"
36 #include "core/loader/FrameLoader.h" 37 #include "core/loader/FrameLoader.h"
37 #include "core/page/FocusController.h" 38 #include "core/page/FocusController.h"
38 #include "core/page/Page.h" 39 #include "core/page/Page.h"
39 #include "core/rendering/RenderPart.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 using namespace HTMLNames; 43 using namespace HTMLNames;
44 44
45 HTMLFrameElementBase::HTMLFrameElementBase(const QualifiedName& tagName, Documen t& document) 45 HTMLFrameElementBase::HTMLFrameElementBase(const QualifiedName& tagName, Documen t& document)
46 : HTMLFrameOwnerElement(tagName, document) 46 : HTMLFrameOwnerElement(tagName, document)
47 , m_scrolling(ScrollbarAuto) 47 , m_scrolling(ScrollbarAuto)
48 , m_marginWidth(-1) 48 , m_marginWidth(-1)
49 , m_marginHeight(-1) 49 , m_marginHeight(-1)
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 if (!SubframeLoadingDisabler::canLoadFrame(*this)) 152 if (!SubframeLoadingDisabler::canLoadFrame(*this))
153 return; 153 return;
154 154
155 setNameAndOpenURL(); 155 setNameAndOpenURL();
156 } 156 }
157 157
158 void HTMLFrameElementBase::attach(const AttachContext& context) 158 void HTMLFrameElementBase::attach(const AttachContext& context)
159 { 159 {
160 HTMLFrameOwnerElement::attach(context); 160 HTMLFrameOwnerElement::attach(context);
161 161
162 if (renderPart()) { 162 if (layoutPart()) {
163 if (Frame* frame = contentFrame()) { 163 if (Frame* frame = contentFrame()) {
164 if (frame->isLocalFrame()) 164 if (frame->isLocalFrame())
165 setWidget(toLocalFrame(frame)->view()); 165 setWidget(toLocalFrame(frame)->view());
166 } 166 }
167 } 167 }
168 } 168 }
169 169
170 void HTMLFrameElementBase::setLocation(const String& str) 170 void HTMLFrameElementBase::setLocation(const String& str)
171 { 171 {
172 m_URL = AtomicString(str); 172 m_URL = AtomicString(str);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 void HTMLFrameElementBase::defaultEventHandler(Event* event) 212 void HTMLFrameElementBase::defaultEventHandler(Event* event)
213 { 213 {
214 if (contentFrame() && contentFrame()->isRemoteFrame()) { 214 if (contentFrame() && contentFrame()->isRemoteFrame()) {
215 toRemoteFrame(contentFrame())->forwardInputEvent(event); 215 toRemoteFrame(contentFrame())->forwardInputEvent(event);
216 return; 216 return;
217 } 217 }
218 HTMLFrameOwnerElement::defaultEventHandler(event); 218 HTMLFrameOwnerElement::defaultEventHandler(event);
219 } 219 }
220 220
221 } // namespace blink 221 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLEmbedElement.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698