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

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

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Handle shared-renderer case. Created 6 years, 8 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 | Annotate | Revision Log
« 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 if (!SubframeLoadingDisabler::canLoadFrame(*this)) 151 if (!SubframeLoadingDisabler::canLoadFrame(*this))
152 return; 152 return;
153 153
154 setNameAndOpenURL(); 154 setNameAndOpenURL();
155 } 155 }
156 156
157 void HTMLFrameElementBase::attach(const AttachContext& context) 157 void HTMLFrameElementBase::attach(const AttachContext& context)
158 { 158 {
159 HTMLFrameOwnerElement::attach(context); 159 HTMLFrameOwnerElement::attach(context);
160 160
161 if (RenderPart* part = renderPart()) { 161 if (renderPart()) {
162 if (Frame* frame = contentFrame()) { 162 if (Frame* frame = contentFrame()) {
163 if (frame->isLocalFrame()) 163 if (frame->isLocalFrame())
164 part->setWidget(toLocalFrame(frame)->view()); 164 setWidget(toLocalFrame(frame)->view());
165 } 165 }
166 } 166 }
167 } 167 }
168 168
169 void HTMLFrameElementBase::setLocation(const String& str) 169 void HTMLFrameElementBase::setLocation(const String& str)
170 { 170 {
171 m_URL = AtomicString(str); 171 m_URL = AtomicString(str);
172 172
173 if (inDocument()) 173 if (inDocument())
174 openURL(false); 174 openURL(false);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 216
217 int HTMLFrameElementBase::height() 217 int HTMLFrameElementBase::height()
218 { 218 {
219 document().updateLayoutIgnorePendingStylesheets(); 219 document().updateLayoutIgnorePendingStylesheets();
220 if (!renderBox()) 220 if (!renderBox())
221 return 0; 221 return 0;
222 return renderBox()->height(); 222 return renderBox()->height();
223 } 223 }
224 224
225 } // namespace WebCore 225 } // namespace WebCore
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