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

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

Issue 625073002: Merge RenderWidget into single subclass, RenderPart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments Created 6 years, 2 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/HTMLObjectElement.h ('k') | Source/core/html/HTMLPlugInElement.h » ('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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 element->ensureUserAgentShadowRoot(); 68 element->ensureUserAgentShadowRoot();
69 return element.release(); 69 return element.release();
70 } 70 }
71 71
72 void HTMLObjectElement::trace(Visitor* visitor) 72 void HTMLObjectElement::trace(Visitor* visitor)
73 { 73 {
74 FormAssociatedElement::trace(visitor); 74 FormAssociatedElement::trace(visitor);
75 HTMLPlugInElement::trace(visitor); 75 HTMLPlugInElement::trace(visitor);
76 } 76 }
77 77
78 RenderWidget* HTMLObjectElement::existingRenderWidget() const 78 RenderPart* HTMLObjectElement::existingRenderPart() const
79 { 79 {
80 return renderPart(); // This will return 0 if the renderer is not a RenderPa rt. 80 return renderPart(); // This will return 0 if the renderer is not a RenderPa rt.
81 } 81 }
82 82
83 bool HTMLObjectElement::isPresentationAttribute(const QualifiedName& name) const 83 bool HTMLObjectElement::isPresentationAttribute(const QualifiedName& name) const
84 { 84 {
85 if (name == borderAttr) 85 if (name == borderAttr)
86 return true; 86 return true;
87 return HTMLPlugInElement::isPresentationAttribute(name); 87 return HTMLPlugInElement::isPresentationAttribute(name);
88 } 88 }
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 { 457 {
458 return fastHasAttribute(usemapAttr); 458 return fastHasAttribute(usemapAttr);
459 } 459 }
460 460
461 bool HTMLObjectElement::useFallbackContent() const 461 bool HTMLObjectElement::useFallbackContent() const
462 { 462 {
463 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; 463 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent;
464 } 464 }
465 465
466 } 466 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLObjectElement.h ('k') | Source/core/html/HTMLPlugInElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698