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

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

Issue 320253002: Oilpan: Prepare to move ImageLoader and its subclasses to Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 6 months 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // FIXME: What is the right thing to do here? Should we supress the 108 // FIXME: What is the right thing to do here? Should we supress the
109 // reload stuff when a persistable widget-type is specified? 109 // reload stuff when a persistable widget-type is specified?
110 reloadPluginOnAttributeChange(name); 110 reloadPluginOnAttributeChange(name);
111 if (!renderer()) 111 if (!renderer())
112 requestPluginCreationWithoutRendererIfPossible(); 112 requestPluginCreationWithoutRendererIfPossible();
113 } else if (name == dataAttr) { 113 } else if (name == dataAttr) {
114 m_url = stripLeadingAndTrailingHTMLSpaces(value); 114 m_url = stripLeadingAndTrailingHTMLSpaces(value);
115 if (renderer() && isImageType()) { 115 if (renderer() && isImageType()) {
116 setNeedsWidgetUpdate(true); 116 setNeedsWidgetUpdate(true);
117 if (!m_imageLoader) 117 if (!m_imageLoader)
118 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); 118 m_imageLoader = HTMLImageLoader::create(this);
119 m_imageLoader->updateFromElementIgnoringPreviousError(); 119 m_imageLoader->updateFromElementIgnoringPreviousError();
120 } else { 120 } else {
121 reloadPluginOnAttributeChange(name); 121 reloadPluginOnAttributeChange(name);
122 } 122 }
123 } else if (name == classidAttr) { 123 } else if (name == classidAttr) {
124 m_classId = value; 124 m_classId = value;
125 reloadPluginOnAttributeChange(name); 125 reloadPluginOnAttributeChange(name);
126 } else { 126 } else {
127 HTMLPlugInElement::parseAttribute(name, value); 127 HTMLPlugInElement::parseAttribute(name, value);
128 } 128 }
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 { 489 {
490 return fastHasAttribute(usemapAttr); 490 return fastHasAttribute(usemapAttr);
491 } 491 }
492 492
493 bool HTMLObjectElement::useFallbackContent() const 493 bool HTMLObjectElement::useFallbackContent() const
494 { 494 {
495 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 495 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
496 } 496 }
497 497
498 } 498 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698