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

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: Add tests, make plugin creation synchronous. 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 { 94 {
95 if (name == formAttr) 95 if (name == formAttr)
96 formAttributeChanged(); 96 formAttributeChanged();
97 else if (name == typeAttr) { 97 else if (name == typeAttr) {
98 m_serviceType = value.lower(); 98 m_serviceType = value.lower();
99 size_t pos = m_serviceType.find(";"); 99 size_t pos = m_serviceType.find(";");
100 if (pos != kNotFound) 100 if (pos != kNotFound)
101 m_serviceType = m_serviceType.left(pos); 101 m_serviceType = m_serviceType.left(pos);
102 if (renderer()) 102 if (renderer())
103 setNeedsWidgetUpdate(true); 103 setNeedsWidgetUpdate(true);
104 else
105 requestPluginCreationWithoutRendererIfPossible();
104 } else if (name == dataAttr) { 106 } else if (name == dataAttr) {
105 m_url = stripLeadingAndTrailingHTMLSpaces(value); 107 m_url = stripLeadingAndTrailingHTMLSpaces(value);
106 if (renderer()) { 108 if (renderer()) {
107 setNeedsWidgetUpdate(true); 109 setNeedsWidgetUpdate(true);
108 if (isImageType()) { 110 if (isImageType()) {
109 if (!m_imageLoader) 111 if (!m_imageLoader)
110 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); 112 m_imageLoader = adoptPtr(new HTMLImageLoader(this));
111 m_imageLoader->updateFromElementIgnoringPreviousError(); 113 m_imageLoader->updateFromElementIgnoringPreviousError();
112 } 114 }
113 } 115 }
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 { 482 {
481 FormAssociatedElement::didMoveToNewDocument(oldDocument); 483 FormAssociatedElement::didMoveToNewDocument(oldDocument);
482 HTMLPlugInElement::didMoveToNewDocument(oldDocument); 484 HTMLPlugInElement::didMoveToNewDocument(oldDocument);
483 } 485 }
484 486
485 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool) 487 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool)
486 { 488 {
487 if (name().isEmpty()) 489 if (name().isEmpty())
488 return false; 490 return false;
489 491
490 Widget* widget = pluginWidget(); 492 Widget* widget = this->widget();
491 if (!widget || !widget->isPluginView()) 493 if (!widget || !widget->isPluginView())
492 return false; 494 return false;
493 String value; 495 String value;
494 if (!toPluginView(widget)->getFormValue(value)) 496 if (!toPluginView(widget)->getFormValue(value))
495 return false; 497 return false;
496 encoding.appendData(name(), value); 498 encoding.appendData(name(), value);
497 return true; 499 return true;
498 } 500 }
499 501
500 HTMLFormElement* HTMLObjectElement::virtualForm() const 502 HTMLFormElement* HTMLObjectElement::virtualForm() const
501 { 503 {
502 return FormAssociatedElement::form(); 504 return FormAssociatedElement::form();
503 } 505 }
504 506
505 bool HTMLObjectElement::isInteractiveContent() const 507 bool HTMLObjectElement::isInteractiveContent() const
506 { 508 {
507 return fastHasAttribute(usemapAttr); 509 return fastHasAttribute(usemapAttr);
508 } 510 }
509 511
510 bool HTMLObjectElement::useFallbackContent() const 512 bool HTMLObjectElement::useFallbackContent() const
511 { 513 {
512 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 514 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
513 } 515 }
514 516
515 } 517 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698