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

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

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix mac compile issue. Created 7 years 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 { 93 {
94 if (name == formAttr) 94 if (name == formAttr)
95 formAttributeChanged(); 95 formAttributeChanged();
96 else if (name == typeAttr) { 96 else if (name == typeAttr) {
97 m_serviceType = value.lower(); 97 m_serviceType = value.lower();
98 size_t pos = m_serviceType.find(";"); 98 size_t pos = m_serviceType.find(";");
99 if (pos != kNotFound) 99 if (pos != kNotFound)
100 m_serviceType = m_serviceType.left(pos); 100 m_serviceType = m_serviceType.left(pos);
101 if (renderer()) 101 if (renderer())
102 setNeedsWidgetUpdate(true); 102 setNeedsWidgetUpdate(true);
103 else
104 requestPluginCreationWithoutRendererIfPossible();
103 } else if (name == dataAttr) { 105 } else if (name == dataAttr) {
104 m_url = stripLeadingAndTrailingHTMLSpaces(value); 106 m_url = stripLeadingAndTrailingHTMLSpaces(value);
105 if (renderer()) { 107 if (renderer()) {
106 setNeedsWidgetUpdate(true); 108 setNeedsWidgetUpdate(true);
107 if (isImageType()) { 109 if (isImageType()) {
108 if (!m_imageLoader) 110 if (!m_imageLoader)
109 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); 111 m_imageLoader = adoptPtr(new HTMLImageLoader(this));
110 m_imageLoader->updateFromElementIgnoringPreviousError(); 112 m_imageLoader->updateFromElementIgnoringPreviousError();
111 } 113 }
112 } 114 }
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 { 434 {
433 FormAssociatedElement::didMoveToNewDocument(oldDocument); 435 FormAssociatedElement::didMoveToNewDocument(oldDocument);
434 HTMLPlugInElement::didMoveToNewDocument(oldDocument); 436 HTMLPlugInElement::didMoveToNewDocument(oldDocument);
435 } 437 }
436 438
437 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool) 439 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool)
438 { 440 {
439 if (name().isEmpty()) 441 if (name().isEmpty())
440 return false; 442 return false;
441 443
442 Widget* widget = pluginWidget(); 444 Widget* widget = this->widget();
443 if (!widget || !widget->isPluginView()) 445 if (!widget || !widget->isPluginView())
444 return false; 446 return false;
445 String value; 447 String value;
446 if (!toPluginView(widget)->getFormValue(value)) 448 if (!toPluginView(widget)->getFormValue(value))
447 return false; 449 return false;
448 encoding.appendData(name(), value); 450 encoding.appendData(name(), value);
449 return true; 451 return true;
450 } 452 }
451 453
452 HTMLFormElement* HTMLObjectElement::formOwner() const 454 HTMLFormElement* HTMLObjectElement::formOwner() const
453 { 455 {
454 return FormAssociatedElement::form(); 456 return FormAssociatedElement::form();
455 } 457 }
456 458
457 bool HTMLObjectElement::isInteractiveContent() const 459 bool HTMLObjectElement::isInteractiveContent() const
458 { 460 {
459 return fastHasAttribute(usemapAttr); 461 return fastHasAttribute(usemapAttr);
460 } 462 }
461 463
462 bool HTMLObjectElement::useFallbackContent() const 464 bool HTMLObjectElement::useFallbackContent() const
463 { 465 {
464 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 466 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
465 } 467 }
466 468
467 } 469 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698