| OLD | NEW |
| 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 url = url_ = overriden_url.GetString(); | 320 url = url_ = overriden_url.GetString(); |
| 321 service_type = service_type_ = "text/html"; | 321 service_type = service_type_ = "text/html"; |
| 322 } | 322 } |
| 323 | 323 |
| 324 if (!HasValidClassId() || | 324 if (!HasValidClassId() || |
| 325 !RequestObject(url, service_type, param_names, param_values)) { | 325 !RequestObject(url, service_type, param_names, param_values)) { |
| 326 if (!url.IsEmpty()) | 326 if (!url.IsEmpty()) |
| 327 DispatchErrorEvent(); | 327 DispatchErrorEvent(); |
| 328 if (HasFallbackContent()) | 328 if (HasFallbackContent()) |
| 329 RenderFallbackContent(); | 329 RenderFallbackContent(); |
| 330 } else { |
| 331 if (IsErrorplaceholder()) |
| 332 DispatchErrorEvent(); |
| 330 } | 333 } |
| 331 } | 334 } |
| 332 | 335 |
| 333 Node::InsertionNotificationRequest HTMLObjectElement::InsertedInto( | 336 Node::InsertionNotificationRequest HTMLObjectElement::InsertedInto( |
| 334 ContainerNode* insertion_point) { | 337 ContainerNode* insertion_point) { |
| 335 HTMLPlugInElement::InsertedInto(insertion_point); | 338 HTMLPlugInElement::InsertedInto(insertion_point); |
| 336 ListedElement::InsertedInto(insertion_point); | 339 ListedElement::InsertedInto(insertion_point); |
| 337 return kInsertionDone; | 340 return kInsertionDone; |
| 338 } | 341 } |
| 339 | 342 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 | 464 |
| 462 bool HTMLObjectElement::WillUseFallbackContentAtLayout() const { | 465 bool HTMLObjectElement::WillUseFallbackContentAtLayout() const { |
| 463 return !HasValidClassId() && HasFallbackContent(); | 466 return !HasValidClassId() && HasFallbackContent(); |
| 464 } | 467 } |
| 465 | 468 |
| 466 void HTMLObjectElement::AssociateWith(HTMLFormElement* form) { | 469 void HTMLObjectElement::AssociateWith(HTMLFormElement* form) { |
| 467 AssociateByParser(form); | 470 AssociateByParser(form); |
| 468 }; | 471 }; |
| 469 | 472 |
| 470 } // namespace blink | 473 } // namespace blink |
| OLD | NEW |