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

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

Issue 732783002: Reland HTMLPlugInElement: Use custom focus logic only when there is a plugin. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 1 month 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
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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 { 430 {
431 FormAssociatedElement::didMoveToNewDocument(oldDocument); 431 FormAssociatedElement::didMoveToNewDocument(oldDocument);
432 HTMLPlugInElement::didMoveToNewDocument(oldDocument); 432 HTMLPlugInElement::didMoveToNewDocument(oldDocument);
433 } 433 }
434 434
435 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool) 435 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool)
436 { 436 {
437 if (name().isEmpty()) 437 if (name().isEmpty())
438 return false; 438 return false;
439 439
440 Widget* widget = pluginWidget(); 440 // Widget is needed immediately to satisfy cases like
441 // LayoutTests/plugins/form-value.html.
442 Widget* widget = pluginWidgetForJSBindings();
441 if (!widget || !widget->isPluginView()) 443 if (!widget || !widget->isPluginView())
442 return false; 444 return false;
443 String value; 445 String value;
444 if (!toPluginView(widget)->getFormValue(value)) 446 if (!toPluginView(widget)->getFormValue(value))
445 return false; 447 return false;
446 encoding.appendData(name(), value); 448 encoding.appendData(name(), value);
447 return true; 449 return true;
448 } 450 }
449 451
450 HTMLFormElement* HTMLObjectElement::formOwner() const 452 HTMLFormElement* HTMLObjectElement::formOwner() const
451 { 453 {
452 return FormAssociatedElement::form(); 454 return FormAssociatedElement::form();
453 } 455 }
454 456
455 bool HTMLObjectElement::isInteractiveContent() const 457 bool HTMLObjectElement::isInteractiveContent() const
456 { 458 {
457 return fastHasAttribute(usemapAttr); 459 return fastHasAttribute(usemapAttr);
458 } 460 }
459 461
460 bool HTMLObjectElement::useFallbackContent() const 462 bool HTMLObjectElement::useFallbackContent() const
461 { 463 {
462 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 464 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
463 } 465 }
464 466
465 } 467 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/plugins/plugin-placeholder-focus-expected.txt ('k') | Source/core/html/HTMLPlugInElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698