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

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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
« no previous file with comments | « Source/core/html/HTMLOListElement.cpp ('k') | Source/core/html/HTMLOptGroupElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 if (name == formAttr) 100 if (name == formAttr)
101 formAttributeChanged(); 101 formAttributeChanged();
102 else if (name == typeAttr) { 102 else if (name == typeAttr) {
103 m_serviceType = value.lower(); 103 m_serviceType = value.lower();
104 size_t pos = m_serviceType.find(";"); 104 size_t pos = m_serviceType.find(";");
105 if (pos != kNotFound) 105 if (pos != kNotFound)
106 m_serviceType = m_serviceType.left(pos); 106 m_serviceType = m_serviceType.left(pos);
107 // FIXME: What is the right thing to do here? Should we supress the 107 // FIXME: What is the right thing to do here? Should we supress the
108 // reload stuff when a persistable widget-type is specified? 108 // reload stuff when a persistable widget-type is specified?
109 reloadPluginOnAttributeChange(name); 109 reloadPluginOnAttributeChange(name);
110 if (!renderer()) 110 if (!layoutObject())
111 requestPluginCreationWithoutRendererIfPossible(); 111 requestPluginCreationWithoutRendererIfPossible();
112 } else if (name == dataAttr) { 112 } else if (name == dataAttr) {
113 m_url = stripLeadingAndTrailingHTMLSpaces(value); 113 m_url = stripLeadingAndTrailingHTMLSpaces(value);
114 if (renderer() && isImageType()) { 114 if (layoutObject() && isImageType()) {
115 setNeedsWidgetUpdate(true); 115 setNeedsWidgetUpdate(true);
116 if (!m_imageLoader) 116 if (!m_imageLoader)
117 m_imageLoader = HTMLImageLoader::create(this); 117 m_imageLoader = HTMLImageLoader::create(this);
118 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr ror); 118 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr ror);
119 } else { 119 } else {
120 reloadPluginOnAttributeChange(name); 120 reloadPluginOnAttributeChange(name);
121 } 121 }
122 } else if (name == classidAttr) { 122 } else if (name == classidAttr) {
123 m_classId = value; 123 m_classId = value;
124 reloadPluginOnAttributeChange(name); 124 reloadPluginOnAttributeChange(name);
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 Vector<String> paramValues; 287 Vector<String> paramValues;
288 parametersForPlugin(paramNames, paramValues, url, serviceType); 288 parametersForPlugin(paramNames, paramValues, url, serviceType);
289 289
290 // Note: url is modified above by parametersForPlugin. 290 // Note: url is modified above by parametersForPlugin.
291 if (!allowedToLoadFrameURL(url)) { 291 if (!allowedToLoadFrameURL(url)) {
292 dispatchErrorEvent(); 292 dispatchErrorEvent();
293 return; 293 return;
294 } 294 }
295 295
296 // FIXME: Is it possible to get here without a renderer now that we don't ha ve beforeload events? 296 // FIXME: Is it possible to get here without a renderer now that we don't ha ve beforeload events?
297 if (!renderer()) 297 if (!layoutObject())
298 return; 298 return;
299 299
300 if (!hasValidClassId() || !requestObject(url, serviceType, paramNames, param Values)) { 300 if (!hasValidClassId() || !requestObject(url, serviceType, paramNames, param Values)) {
301 if (!url.isEmpty()) 301 if (!url.isEmpty())
302 dispatchErrorEvent(); 302 dispatchErrorEvent();
303 if (hasFallbackContent()) 303 if (hasFallbackContent())
304 renderFallbackContent(); 304 renderFallbackContent();
305 } 305 }
306 } 306 }
307 307
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 { 458 {
459 return fastHasAttribute(usemapAttr); 459 return fastHasAttribute(usemapAttr);
460 } 460 }
461 461
462 bool HTMLObjectElement::useFallbackContent() const 462 bool HTMLObjectElement::useFallbackContent() const
463 { 463 {
464 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 464 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
465 } 465 }
466 466
467 } 467 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLOListElement.cpp ('k') | Source/core/html/HTMLOptGroupElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698