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

Side by Side Diff: Source/core/html/HTMLFrameSetElement.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/HTMLFrameSetElement.h ('k') | Source/core/html/HTMLIFrameElement.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 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 13 matching lines...) Expand all
24 #include "config.h" 24 #include "config.h"
25 #include "core/html/HTMLFrameSetElement.h" 25 #include "core/html/HTMLFrameSetElement.h"
26 26
27 #include "CSSPropertyNames.h" 27 #include "CSSPropertyNames.h"
28 #include "HTMLNames.h" 28 #include "HTMLNames.h"
29 #include "bindings/v8/ScriptEventListener.h" 29 #include "bindings/v8/ScriptEventListener.h"
30 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
31 #include "core/dom/Event.h" 31 #include "core/dom/Event.h"
32 #include "core/dom/EventNames.h" 32 #include "core/dom/EventNames.h"
33 #include "core/dom/MouseEvent.h" 33 #include "core/dom/MouseEvent.h"
34 #include "core/dom/NodeRenderingContext.h"
35 #include "core/html/HTMLCollection.h" 34 #include "core/html/HTMLCollection.h"
36 #include "core/html/HTMLDimension.h" 35 #include "core/html/HTMLDimension.h"
37 #include "core/html/HTMLFrameElement.h" 36 #include "core/html/HTMLFrameElement.h"
38 #include "core/loader/FrameLoaderClient.h" 37 #include "core/loader/FrameLoaderClient.h"
39 #include "core/page/Frame.h" 38 #include "core/page/Frame.h"
40 #include "core/rendering/RenderFrameSet.h" 39 #include "core/rendering/RenderFrameSet.h"
41 40
42 namespace WebCore { 41 namespace WebCore {
43 42
44 using namespace HTMLNames; 43 using namespace HTMLNames;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 else if (name == ononlineAttr) 139 else if (name == ononlineAttr)
141 document().setWindowAttributeEventListener(eventNames().onlineEvent, cre ateAttributeEventListener(document().frame(), name, value)); 140 document().setWindowAttributeEventListener(eventNames().onlineEvent, cre ateAttributeEventListener(document().frame(), name, value));
142 else if (name == onofflineAttr) 141 else if (name == onofflineAttr)
143 document().setWindowAttributeEventListener(eventNames().offlineEvent, cr eateAttributeEventListener(document().frame(), name, value)); 142 document().setWindowAttributeEventListener(eventNames().offlineEvent, cr eateAttributeEventListener(document().frame(), name, value));
144 else if (name == onpopstateAttr) 143 else if (name == onpopstateAttr)
145 document().setWindowAttributeEventListener(eventNames().popstateEvent, c reateAttributeEventListener(document().frame(), name, value)); 144 document().setWindowAttributeEventListener(eventNames().popstateEvent, c reateAttributeEventListener(document().frame(), name, value));
146 else 145 else
147 HTMLElement::parseAttribute(name, value); 146 HTMLElement::parseAttribute(name, value);
148 } 147 }
149 148
150 bool HTMLFrameSetElement::rendererIsNeeded(const NodeRenderingContext& context) 149 bool HTMLFrameSetElement::rendererIsNeeded(const RenderStyle& style)
151 { 150 {
152 // For compatibility, frames render even when display: none is set. 151 // For compatibility, frames render even when display: none is set.
153 // However, we delay creating a renderer until stylesheets have loaded. 152 // However, we delay creating a renderer until stylesheets have loaded.
154 return context.style()->isStyleAvailable(); 153 return style.isStyleAvailable();
155 } 154 }
156 155
157 RenderObject* HTMLFrameSetElement::createRenderer(RenderStyle *style) 156 RenderObject* HTMLFrameSetElement::createRenderer(RenderStyle *style)
158 { 157 {
159 if (style->hasContent()) 158 if (style->hasContent())
160 return RenderObject::createObject(this, style); 159 return RenderObject::createObject(this, style);
161 160
162 return new RenderFrameSet(this); 161 return new RenderFrameSet(this);
163 } 162 }
164 163
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 Node* frameNode = children()->namedItem(name); 218 Node* frameNode = children()->namedItem(name);
220 if (!frameNode || !frameNode->hasTagName(HTMLNames::frameTag)) 219 if (!frameNode || !frameNode->hasTagName(HTMLNames::frameTag))
221 return 0; 220 return 0;
222 Document* document = toHTMLFrameElement(frameNode)->contentDocument(); 221 Document* document = toHTMLFrameElement(frameNode)->contentDocument();
223 if (!document || !document->frame()) 222 if (!document || !document->frame())
224 return 0; 223 return 0;
225 return document->domWindow(); 224 return document->domWindow();
226 } 225 }
227 226
228 } // namespace WebCore 227 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameSetElement.h ('k') | Source/core/html/HTMLIFrameElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698