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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/HTMLAppletElement.h ('k') | Source/core/html/HTMLAreaElement.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, 2008, 2009, 2012 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012 Apple Inc. All rights reserv ed.
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 return name == codebaseAttr || HTMLPlugInElement::hasLegalLinkAttribute(name ); 83 return name == codebaseAttr || HTMLPlugInElement::hasLegalLinkAttribute(name );
84 } 84 }
85 85
86 bool HTMLAppletElement::rendererIsNeeded(const RenderStyle& style) 86 bool HTMLAppletElement::rendererIsNeeded(const RenderStyle& style)
87 { 87 {
88 if (!fastHasAttribute(codeAttr) && !hasAuthorShadowRoot()) 88 if (!fastHasAttribute(codeAttr) && !hasAuthorShadowRoot())
89 return false; 89 return false;
90 return HTMLPlugInElement::rendererIsNeeded(style); 90 return HTMLPlugInElement::rendererIsNeeded(style);
91 } 91 }
92 92
93 RenderObject* HTMLAppletElement::createRenderer(const RenderStyle& style) 93 LayoutObject* HTMLAppletElement::createRenderer(const RenderStyle& style)
94 { 94 {
95 if (!canEmbedJava() || hasAuthorShadowRoot()) 95 if (!canEmbedJava() || hasAuthorShadowRoot())
96 return RenderObject::createObject(this, style); 96 return LayoutObject::createObject(this, style);
97 97
98 if (usePlaceholderContent()) 98 if (usePlaceholderContent())
99 return new RenderBlockFlow(this); 99 return new RenderBlockFlow(this);
100 100
101 return new RenderApplet(this); 101 return new RenderApplet(this);
102 } 102 }
103 103
104 RenderPart* HTMLAppletElement::renderPartForJSBindings() const 104 RenderPart* HTMLAppletElement::renderPartForJSBindings() const
105 { 105 {
106 if (!canEmbedJava()) 106 if (!canEmbedJava())
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) 229 if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
230 || !document().contentSecurityPolicy()->allowPluginType(m_serviceType, m _serviceType, url)) { 230 || !document().contentSecurityPolicy()->allowPluginType(m_serviceType, m _serviceType, url)) {
231 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy); 231 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy);
232 return false; 232 return false;
233 } 233 }
234 return true; 234 return true;
235 } 235 }
236 236
237 } 237 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLAppletElement.h ('k') | Source/core/html/HTMLAreaElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698