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

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: Address comments. 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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 { 421 {
420 FormAssociatedElement::didMoveToNewDocument(oldDocument); 422 FormAssociatedElement::didMoveToNewDocument(oldDocument);
421 HTMLPlugInElement::didMoveToNewDocument(oldDocument); 423 HTMLPlugInElement::didMoveToNewDocument(oldDocument);
422 } 424 }
423 425
424 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool) 426 bool HTMLObjectElement::appendFormData(FormDataList& encoding, bool)
425 { 427 {
426 if (name().isEmpty()) 428 if (name().isEmpty())
427 return false; 429 return false;
428 430
429 Widget* widget = pluginWidget(); 431 Widget* widget = this->widget();
430 if (!widget || !widget->isPluginView()) 432 if (!widget || !widget->isPluginView())
431 return false; 433 return false;
432 String value; 434 String value;
433 if (!toPluginView(widget)->getFormValue(value)) 435 if (!toPluginView(widget)->getFormValue(value))
434 return false; 436 return false;
435 encoding.appendData(name(), value); 437 encoding.appendData(name(), value);
436 return true; 438 return true;
437 } 439 }
438 440
439 HTMLFormElement* HTMLObjectElement::formOwner() const 441 HTMLFormElement* HTMLObjectElement::formOwner() const
440 { 442 {
441 return FormAssociatedElement::form(); 443 return FormAssociatedElement::form();
442 } 444 }
443 445
444 bool HTMLObjectElement::isInteractiveContent() const 446 bool HTMLObjectElement::isInteractiveContent() const
445 { 447 {
446 return fastHasAttribute(usemapAttr); 448 return fastHasAttribute(usemapAttr);
447 } 449 }
448 450
449 bool HTMLObjectElement::useFallbackContent() const 451 bool HTMLObjectElement::useFallbackContent() const
450 { 452 {
451 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 453 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
452 } 454 }
453 455
454 } 456 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698