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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. 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
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 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 HTMLElement::parseAttribute(name, value); 147 HTMLElement::parseAttribute(name, value);
148 } 148 }
149 149
150 bool HTMLFrameSetElement::rendererIsNeeded(const RenderStyle& style) 150 bool HTMLFrameSetElement::rendererIsNeeded(const RenderStyle& style)
151 { 151 {
152 // For compatibility, frames render even when display: none is set. 152 // For compatibility, frames render even when display: none is set.
153 // However, we delay creating a renderer until stylesheets have loaded. 153 // However, we delay creating a renderer until stylesheets have loaded.
154 return style.isStyleAvailable(); 154 return style.isStyleAvailable();
155 } 155 }
156 156
157 RenderObject* HTMLFrameSetElement::createRenderer(RenderStyle *style) 157 RenderObject* HTMLFrameSetElement::createRenderer(const RenderStyle *style)
158 { 158 {
159 if (style->hasContent()) 159 if (style->hasContent())
160 return RenderObject::createObject(this, style); 160 return RenderObject::createObject(this, style);
161 161
162 return new RenderFrameSet(this); 162 return new RenderFrameSet(this);
163 } 163 }
164 164
165 void HTMLFrameSetElement::attach(const AttachContext& context) 165 void HTMLFrameSetElement::attach(const AttachContext& context)
166 { 166 {
167 // Inherit default settings from parent frameset 167 // Inherit default settings from parent frameset
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 Element* frameElement = children()->namedItem(name); 215 Element* frameElement = children()->namedItem(name);
216 if (!isHTMLFrameElement(frameElement)) 216 if (!isHTMLFrameElement(frameElement))
217 return nullptr; 217 return nullptr;
218 Document* document = toHTMLFrameElement(frameElement)->contentDocument(); 218 Document* document = toHTMLFrameElement(frameElement)->contentDocument();
219 if (!document || !document->frame()) 219 if (!document || !document->frame())
220 return nullptr; 220 return nullptr;
221 return document->domWindow(); 221 return document->domWindow();
222 } 222 }
223 223
224 } // namespace blink 224 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698