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

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

Issue 23956012: Stop passing NodeRenderingContext except in textRendererIsNeeded (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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/HTMLDetailsElement.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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 || name == codebaseAttr 61 || name == codebaseAttr
62 || name == mayscriptAttr 62 || name == mayscriptAttr
63 || name == objectAttr) { 63 || name == objectAttr) {
64 // Do nothing. 64 // Do nothing.
65 return; 65 return;
66 } 66 }
67 67
68 HTMLPlugInImageElement::parseAttribute(name, value); 68 HTMLPlugInImageElement::parseAttribute(name, value);
69 } 69 }
70 70
71 bool HTMLAppletElement::rendererIsNeeded(const NodeRenderingContext& context) 71 bool HTMLAppletElement::rendererIsNeeded(const RenderStyle& style)
72 { 72 {
73 if (!fastHasAttribute(codeAttr)) 73 if (!fastHasAttribute(codeAttr))
74 return false; 74 return false;
75 return HTMLPlugInImageElement::rendererIsNeeded(context); 75 return HTMLPlugInImageElement::rendererIsNeeded(style);
76 } 76 }
77 77
78 RenderObject* HTMLAppletElement::createRenderer(RenderStyle* style) 78 RenderObject* HTMLAppletElement::createRenderer(RenderStyle* style)
79 { 79 {
80 if (!canEmbedJava()) 80 if (!canEmbedJava())
81 return RenderObject::createObject(this, style); 81 return RenderObject::createObject(this, style);
82 82
83 return new RenderApplet(this); 83 return new RenderApplet(this);
84 } 84 }
85 85
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 if (!settings) 189 if (!settings)
190 return false; 190 return false;
191 191
192 if (!settings->isJavaEnabled()) 192 if (!settings->isJavaEnabled())
193 return false; 193 return false;
194 194
195 return true; 195 return true;
196 } 196 }
197 197
198 } 198 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLAppletElement.h ('k') | Source/core/html/HTMLDetailsElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698