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

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

Issue 625073002: Merge RenderWidget into single subclass, RenderPart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments Created 6 years, 2 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/HTMLObjectElement.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) 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 return; 207 return;
208 208
209 if (m_widget) { 209 if (m_widget) {
210 if (m_widget->parent()) 210 if (m_widget->parent())
211 moveWidgetToParentSoon(m_widget.get(), 0); 211 moveWidgetToParentSoon(m_widget.get(), 0);
212 m_widget = nullptr; 212 m_widget = nullptr;
213 } 213 }
214 214
215 m_widget = widget; 215 m_widget = widget;
216 216
217 RenderWidget* renderWidget = toRenderWidget(renderer()); 217 RenderPart* renderPart = toRenderPart(renderer());
218 if (!renderWidget) 218 if (!renderPart)
219 return; 219 return;
220 220
221 if (m_widget) { 221 if (m_widget) {
222 renderWidget->updateOnWidgetChange(); 222 renderPart->updateOnWidgetChange();
223 223
224 ASSERT(document().view() == renderWidget->frameView()); 224 ASSERT(document().view() == renderPart->frameView());
225 ASSERT(renderWidget->frameView()); 225 ASSERT(renderPart->frameView());
226 moveWidgetToParentSoon(m_widget.get(), renderWidget->frameView()); 226 moveWidgetToParentSoon(m_widget.get(), renderPart->frameView());
227 } 227 }
228 228
229 if (AXObjectCache* cache = document().existingAXObjectCache()) 229 if (AXObjectCache* cache = document().existingAXObjectCache())
230 cache->childrenChanged(renderWidget); 230 cache->childrenChanged(renderPart);
231 } 231 }
232 232
233 Widget* HTMLFrameOwnerElement::ownedWidget() const 233 Widget* HTMLFrameOwnerElement::ownedWidget() const
234 { 234 {
235 return m_widget.get(); 235 return m_widget.get();
236 } 236 }
237 237
238 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic String& frameName, bool lockBackForwardList) 238 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic String& frameName, bool lockBackForwardList)
239 { 239 {
240 RefPtrWillBeRawPtr<LocalFrame> parentFrame = document().frame(); 240 RefPtrWillBeRawPtr<LocalFrame> parentFrame = document().frame();
(...skipping 15 matching lines...) Expand all
256 256
257 void HTMLFrameOwnerElement::trace(Visitor* visitor) 257 void HTMLFrameOwnerElement::trace(Visitor* visitor)
258 { 258 {
259 visitor->trace(m_contentFrame); 259 visitor->trace(m_contentFrame);
260 HTMLElement::trace(visitor); 260 HTMLElement::trace(visitor);
261 FrameOwner::trace(visitor); 261 FrameOwner::trace(visitor);
262 } 262 }
263 263
264 264
265 } // namespace blink 265 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLEmbedElement.cpp ('k') | Source/core/html/HTMLObjectElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698