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

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: Don't store plugin (widget) pointer in RenderWidget. Created 7 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 void HTMLObjectElement::parseAttribute(const QualifiedName& name, const AtomicSt ring& value) 90 void HTMLObjectElement::parseAttribute(const QualifiedName& name, const AtomicSt ring& value)
91 { 91 {
92 if (name == formAttr) 92 if (name == formAttr)
93 formAttributeChanged(); 93 formAttributeChanged();
94 else if (name == typeAttr) { 94 else if (name == typeAttr) {
95 m_serviceType = value.lower(); 95 m_serviceType = value.lower();
96 size_t pos = m_serviceType.find(";"); 96 size_t pos = m_serviceType.find(";");
97 if (pos != kNotFound) 97 if (pos != kNotFound)
98 m_serviceType = m_serviceType.left(pos); 98 m_serviceType = m_serviceType.left(pos);
99 if (renderer()) 99 if (renderer())
100 setNeedsWidgetUpdate(true); 100 setNeedsWidgetUpdate(true);
eseidel 2013/11/18 22:26:45 I take it we're trying to avoid synchronously crea
wjmaclean 2013/11/25 17:51:56 This needs to be investigated further, but I'm gue
101 else
102 createPluginWithoutRenderer(m_serviceType);
101 } else if (name == dataAttr) { 103 } else if (name == dataAttr) {
102 m_url = stripLeadingAndTrailingHTMLSpaces(value); 104 m_url = stripLeadingAndTrailingHTMLSpaces(value);
103 if (renderer()) { 105 if (renderer()) {
104 setNeedsWidgetUpdate(true); 106 setNeedsWidgetUpdate(true);
105 if (isImageType()) { 107 if (isImageType()) {
106 if (!m_imageLoader) 108 if (!m_imageLoader)
107 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); 109 m_imageLoader = adoptPtr(new HTMLImageLoader(this));
108 m_imageLoader->updateFromElementIgnoringPreviousError(); 110 m_imageLoader->updateFromElementIgnoringPreviousError();
109 } 111 }
110 } 112 }
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 { 446 {
445 return FormAssociatedElement::form(); 447 return FormAssociatedElement::form();
446 } 448 }
447 449
448 bool HTMLObjectElement::isInteractiveContent() const 450 bool HTMLObjectElement::isInteractiveContent() const
449 { 451 {
450 return fastHasAttribute(usemapAttr); 452 return fastHasAttribute(usemapAttr);
451 } 453 }
452 454
453 } 455 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLPlugInElement.h » ('j') | Source/core/html/HTMLPlugInElement.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698