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

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

Issue 301353005: Remove hasFallbackContent from RenderEmbeddedObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/HTMLObjectElement.h ('k') | Source/core/html/HTMLPlugInElement.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 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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 Vector<String> paramNames; 319 Vector<String> paramNames;
320 Vector<String> paramValues; 320 Vector<String> paramValues;
321 parametersForPlugin(paramNames, paramValues, url, serviceType); 321 parametersForPlugin(paramNames, paramValues, url, serviceType);
322 322
323 // Note: url is modified above by parametersForPlugin. 323 // Note: url is modified above by parametersForPlugin.
324 if (!allowedToLoadFrameURL(url)) { 324 if (!allowedToLoadFrameURL(url)) {
325 dispatchErrorEvent(); 325 dispatchErrorEvent();
326 return; 326 return;
327 } 327 }
328 328
329 bool fallbackContent = hasFallbackContent();
330 renderEmbeddedObject()->setHasFallbackContent(fallbackContent);
331
332 // FIXME: Is it possible to get here without a renderer now that we don't ha ve beforeload events? 329 // FIXME: Is it possible to get here without a renderer now that we don't ha ve beforeload events?
333 if (!renderer()) 330 if (!renderer())
334 return; 331 return;
335 332
336 if (!hasValidClassId() || !requestObject(url, serviceType, paramNames, param Values)) { 333 if (!hasValidClassId() || !requestObject(url, serviceType, paramNames, param Values)) {
337 if (!url.isEmpty()) 334 if (!url.isEmpty())
338 dispatchErrorEvent(); 335 dispatchErrorEvent();
339 if (fallbackContent) 336 if (hasFallbackContent())
340 renderFallbackContent(); 337 renderFallbackContent();
341 } 338 }
342 } 339 }
343 340
344 bool HTMLObjectElement::rendererIsNeeded(const RenderStyle& style) 341 bool HTMLObjectElement::rendererIsNeeded(const RenderStyle& style)
345 { 342 {
346 // FIXME: This check should not be needed, detached documents never render! 343 // FIXME: This check should not be needed, detached documents never render!
347 if (!document().frame()) 344 if (!document().frame())
348 return false; 345 return false;
349 return HTMLPlugInElement::rendererIsNeeded(style); 346 return HTMLPlugInElement::rendererIsNeeded(style);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 { 489 {
493 return fastHasAttribute(usemapAttr); 490 return fastHasAttribute(usemapAttr);
494 } 491 }
495 492
496 bool HTMLObjectElement::useFallbackContent() const 493 bool HTMLObjectElement::useFallbackContent() const
497 { 494 {
498 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 495 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
499 } 496 }
500 497
501 } 498 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLObjectElement.h ('k') | Source/core/html/HTMLPlugInElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698