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

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

Issue 2733083004: Emit error events if the loading of an object element failed (Closed)
Patch Set: Created 3 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
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 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights
6 * reserved. 6 * reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 url = m_url = overridenUrl.getString(); 318 url = m_url = overridenUrl.getString();
319 serviceType = m_serviceType = "text/html"; 319 serviceType = m_serviceType = "text/html";
320 } 320 }
321 321
322 if (!hasValidClassId() || 322 if (!hasValidClassId() ||
323 !requestObject(url, serviceType, paramNames, paramValues)) { 323 !requestObject(url, serviceType, paramNames, paramValues)) {
324 if (!url.isEmpty()) 324 if (!url.isEmpty())
325 dispatchErrorEvent(); 325 dispatchErrorEvent();
326 if (hasFallbackContent()) 326 if (hasFallbackContent())
327 renderFallbackContent(); 327 renderFallbackContent();
328 } else {
329 if (isPlaceholder())
330 dispatchErrorEvent();
328 } 331 }
329 } 332 }
330 333
331 Node::InsertionNotificationRequest HTMLObjectElement::insertedInto( 334 Node::InsertionNotificationRequest HTMLObjectElement::insertedInto(
332 ContainerNode* insertionPoint) { 335 ContainerNode* insertionPoint) {
333 HTMLPlugInElement::insertedInto(insertionPoint); 336 HTMLPlugInElement::insertedInto(insertionPoint);
334 ListedElement::insertedInto(insertionPoint); 337 ListedElement::insertedInto(insertionPoint);
335 return InsertionDone; 338 return InsertionDone;
336 } 339 }
337 340
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 461
459 bool HTMLObjectElement::willUseFallbackContentAtLayout() const { 462 bool HTMLObjectElement::willUseFallbackContentAtLayout() const {
460 return !hasValidClassId() && hasFallbackContent(); 463 return !hasValidClassId() && hasFallbackContent();
461 } 464 }
462 465
463 void HTMLObjectElement::associateWith(HTMLFormElement* form) { 466 void HTMLObjectElement::associateWith(HTMLFormElement* form) {
464 associateByParser(form); 467 associateByParser(form);
465 }; 468 };
466 469
467 } // namespace blink 470 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698