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

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

Issue 980273005: Clean up HTMLObjectElement/HTMLEmbedElement layoutObjectIsNeeded (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 5 years, 9 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/HTMLObjectElement.h ('k') | no next file » | 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 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 return; 298 return;
299 299
300 if (!hasValidClassId() || !requestObject(url, serviceType, paramNames, param Values)) { 300 if (!hasValidClassId() || !requestObject(url, serviceType, paramNames, param Values)) {
301 if (!url.isEmpty()) 301 if (!url.isEmpty())
302 dispatchErrorEvent(); 302 dispatchErrorEvent();
303 if (hasFallbackContent()) 303 if (hasFallbackContent())
304 renderFallbackContent(); 304 renderFallbackContent();
305 } 305 }
306 } 306 }
307 307
308 bool HTMLObjectElement::layoutObjectIsNeeded(const LayoutStyle& style)
309 {
310 // FIXME: This check should not be needed, detached documents never render!
311 if (!document().frame())
312 return false;
313 return HTMLPlugInElement::layoutObjectIsNeeded(style);
314 }
315
316 Node::InsertionNotificationRequest HTMLObjectElement::insertedInto(ContainerNode * insertionPoint) 308 Node::InsertionNotificationRequest HTMLObjectElement::insertedInto(ContainerNode * insertionPoint)
317 { 309 {
318 HTMLPlugInElement::insertedInto(insertionPoint); 310 HTMLPlugInElement::insertedInto(insertionPoint);
319 FormAssociatedElement::insertedInto(insertionPoint); 311 FormAssociatedElement::insertedInto(insertionPoint);
320 return InsertionDone; 312 return InsertionDone;
321 } 313 }
322 314
323 void HTMLObjectElement::removedFrom(ContainerNode* insertionPoint) 315 void HTMLObjectElement::removedFrom(ContainerNode* insertionPoint)
324 { 316 {
325 HTMLPlugInElement::removedFrom(insertionPoint); 317 HTMLPlugInElement::removedFrom(insertionPoint);
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 { 450 {
459 return fastHasAttribute(usemapAttr); 451 return fastHasAttribute(usemapAttr);
460 } 452 }
461 453
462 bool HTMLObjectElement::useFallbackContent() const 454 bool HTMLObjectElement::useFallbackContent() const
463 { 455 {
464 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 456 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
465 } 457 }
466 458
467 } 459 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLObjectElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698