| 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
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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 { | 422 { |
| 423 FormAssociatedElement::didMoveToNewDocument(oldDocument); | 423 FormAssociatedElement::didMoveToNewDocument(oldDocument); |
| 424 HTMLPlugInElement::didMoveToNewDocument(oldDocument); | 424 HTMLPlugInElement::didMoveToNewDocument(oldDocument); |
| 425 } | 425 } |
| 426 | 426 |
| 427 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool) | 427 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool) |
| 428 { | 428 { |
| 429 if (name().isEmpty()) | 429 if (name().isEmpty()) |
| 430 return false; | 430 return false; |
| 431 | 431 |
| 432 // Widget is needed immediately to satisfy cases like | 432 Widget* widget = pluginWidget(); |
| 433 // LayoutTests/plugins/form-value.html. | |
| 434 Widget* widget = pluginWidgetForJSBindings(); | |
| 435 if (!widget || !widget->isPluginView()) | 433 if (!widget || !widget->isPluginView()) |
| 436 return false; | 434 return false; |
| 437 String value; | 435 String value; |
| 438 if (!toPluginView(widget)->getFormValue(value)) | 436 if (!toPluginView(widget)->getFormValue(value)) |
| 439 return false; | 437 return false; |
| 440 encoding.appendData(name(), value); | 438 encoding.appendData(name(), value); |
| 441 return true; | 439 return true; |
| 442 } | 440 } |
| 443 | 441 |
| 444 HTMLFormElement* HTMLObjectElement::formOwner() const | 442 HTMLFormElement* HTMLObjectElement::formOwner() const |
| 445 { | 443 { |
| 446 return FormAssociatedElement::form(); | 444 return FormAssociatedElement::form(); |
| 447 } | 445 } |
| 448 | 446 |
| 449 bool HTMLObjectElement::isInteractiveContent() const | 447 bool HTMLObjectElement::isInteractiveContent() const |
| 450 { | 448 { |
| 451 return fastHasAttribute(usemapAttr); | 449 return fastHasAttribute(usemapAttr); |
| 452 } | 450 } |
| 453 | 451 |
| 454 bool HTMLObjectElement::useFallbackContent() const | 452 bool HTMLObjectElement::useFallbackContent() const |
| 455 { | 453 { |
| 456 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; | 454 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; |
| 457 } | 455 } |
| 458 | 456 |
| 459 } | 457 } |
| OLD | NEW |