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

Side by Side Diff: Source/core/html/HTMLAppletElement.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/HTMLAppletElement.h ('k') | Source/core/html/HTMLEmbedElement.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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 { 93 {
94 if (!canEmbedJava() || hasAuthorShadowRoot()) 94 if (!canEmbedJava() || hasAuthorShadowRoot())
95 return RenderObject::createObject(this, style); 95 return RenderObject::createObject(this, style);
96 96
97 if (usePlaceholderContent()) 97 if (usePlaceholderContent())
98 return new RenderBlockFlow(this); 98 return new RenderBlockFlow(this);
99 99
100 return new RenderApplet(this); 100 return new RenderApplet(this);
101 } 101 }
102 102
103 RenderWidget* HTMLAppletElement::renderWidgetForJSBindings() const 103 RenderPart* HTMLAppletElement::renderPartForJSBindings() const
104 { 104 {
105 if (!canEmbedJava()) 105 if (!canEmbedJava())
106 return 0; 106 return 0;
107 return HTMLPlugInElement::renderWidgetForJSBindings(); 107 return HTMLPlugInElement::renderPartForJSBindings();
108 } 108 }
109 109
110 RenderWidget* HTMLAppletElement::existingRenderWidget() const 110 RenderPart* HTMLAppletElement::existingRenderPart() const
111 { 111 {
112 return renderPart(); 112 return renderPart();
113 } 113 }
114 114
115 void HTMLAppletElement::updateWidgetInternal() 115 void HTMLAppletElement::updateWidgetInternal()
116 { 116 {
117 setNeedsWidgetUpdate(false); 117 setNeedsWidgetUpdate(false);
118 // FIXME: This should ASSERT isFinishedParsingChildren() instead. 118 // FIXME: This should ASSERT isFinishedParsingChildren() instead.
119 if (!isFinishedParsingChildren()) 119 if (!isFinishedParsingChildren())
120 return; 120 return;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 if (!document().contentSecurityPolicy()->allowObjectFromSource(url) 222 if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
223 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) { 223 || !document().contentSecurityPolicy()->allowPluginType(appletMimeType, appletMimeType, url)) {
224 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy); 224 renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObje ct::PluginBlockedByContentSecurityPolicy);
225 return false; 225 return false;
226 } 226 }
227 return true; 227 return true;
228 } 228 }
229 229
230 } 230 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLAppletElement.h ('k') | Source/core/html/HTMLEmbedElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698