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

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: Fix unit test failures 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
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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 return; 208 return;
209 209
210 if (m_widget) { 210 if (m_widget) {
211 if (m_widget->parent()) 211 if (m_widget->parent())
212 moveWidgetToParentSoon(m_widget.get(), 0); 212 moveWidgetToParentSoon(m_widget.get(), 0);
213 m_widget = nullptr; 213 m_widget = nullptr;
214 } 214 }
215 215
216 m_widget = widget; 216 m_widget = widget;
217 217
218 RenderWidget* renderWidget = toRenderWidget(renderer()); 218 RenderPart* renderPart = toRenderPart(renderer());
219 if (!renderWidget) 219 if (!renderPart)
220 return; 220 return;
221 221
222 if (m_widget) { 222 if (m_widget) {
223 renderWidget->updateOnWidgetChange(); 223 renderPart->updateOnWidgetChange();
224 224
225 ASSERT(document().view() == renderWidget->frameView()); 225 ASSERT(document().view() == renderPart->frameView());
226 ASSERT(renderWidget->frameView()); 226 ASSERT(renderPart->frameView());
227 moveWidgetToParentSoon(m_widget.get(), renderWidget->frameView()); 227 moveWidgetToParentSoon(m_widget.get(), renderPart->frameView());
228 } 228 }
229 229
230 if (AXObjectCache* cache = document().existingAXObjectCache()) 230 if (AXObjectCache* cache = document().existingAXObjectCache())
231 cache->childrenChanged(renderWidget); 231 cache->childrenChanged(renderPart);
232 } 232 }
233 233
234 Widget* HTMLFrameOwnerElement::ownedWidget() const 234 Widget* HTMLFrameOwnerElement::ownedWidget() const
235 { 235 {
236 return m_widget.get(); 236 return m_widget.get();
237 } 237 }
238 238
239 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic String& frameName, bool lockBackForwardList) 239 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(const KURL& url, const Atomic String& frameName, bool lockBackForwardList)
240 { 240 {
241 RefPtrWillBeRawPtr<LocalFrame> parentFrame = document().frame(); 241 RefPtrWillBeRawPtr<LocalFrame> parentFrame = document().frame();
(...skipping 16 matching lines...) Expand all
258 258
259 void HTMLFrameOwnerElement::trace(Visitor* visitor) 259 void HTMLFrameOwnerElement::trace(Visitor* visitor)
260 { 260 {
261 visitor->trace(m_contentFrame); 261 visitor->trace(m_contentFrame);
262 HTMLElement::trace(visitor); 262 HTMLElement::trace(visitor);
263 FrameOwner::trace(visitor); 263 FrameOwner::trace(visitor);
264 } 264 }
265 265
266 266
267 } // namespace blink 267 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698