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

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

Issue 930183002: Move and rename RenderEmbeddedObject and RenderIFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename properly to LayoutIFrame in test expectations. 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
« no previous file with comments | « Source/core/html/HTMLFrameOwnerElement.h ('k') | Source/core/html/HTMLObjectElement.cpp » ('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, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2009 Ericsson AB. All rights reserved. 7 * Copyright (C) 2009 Ericsson AB. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 13 matching lines...) Expand all
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "core/html/HTMLIFrameElement.h" 26 #include "core/html/HTMLIFrameElement.h"
27 27
28 #include "bindings/core/v8/V8DOMActivityLogger.h" 28 #include "bindings/core/v8/V8DOMActivityLogger.h"
29 #include "core/CSSPropertyNames.h" 29 #include "core/CSSPropertyNames.h"
30 #include "core/HTMLNames.h" 30 #include "core/HTMLNames.h"
31 #include "core/frame/UseCounter.h" 31 #include "core/frame/UseCounter.h"
32 #include "core/html/HTMLDocument.h" 32 #include "core/html/HTMLDocument.h"
33 #include "core/inspector/ConsoleMessage.h" 33 #include "core/inspector/ConsoleMessage.h"
34 #include "core/rendering/RenderIFrame.h" 34 #include "core/layout/LayoutIFrame.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 using namespace HTMLNames; 38 using namespace HTMLNames;
39 39
40 inline HTMLIFrameElement::HTMLIFrameElement(Document& document) 40 inline HTMLIFrameElement::HTMLIFrameElement(Document& document)
41 : HTMLFrameElementBase(iframeTag, document) 41 : HTMLFrameElementBase(iframeTag, document)
42 , m_didLoadNonEmptyDocument(false) 42 , m_didLoadNonEmptyDocument(false)
43 { 43 {
44 } 44 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 } 107 }
108 } 108 }
109 109
110 bool HTMLIFrameElement::rendererIsNeeded(const LayoutStyle& style) 110 bool HTMLIFrameElement::rendererIsNeeded(const LayoutStyle& style)
111 { 111 {
112 return isURLAllowed() && HTMLElement::rendererIsNeeded(style); 112 return isURLAllowed() && HTMLElement::rendererIsNeeded(style);
113 } 113 }
114 114
115 LayoutObject* HTMLIFrameElement::createRenderer(const LayoutStyle&) 115 LayoutObject* HTMLIFrameElement::createRenderer(const LayoutStyle&)
116 { 116 {
117 return new RenderIFrame(this); 117 return new LayoutIFrame(this);
118 } 118 }
119 119
120 Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode * insertionPoint) 120 Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode * insertionPoint)
121 { 121 {
122 if (insertionPoint->inDocument()) { 122 if (insertionPoint->inDocument()) {
123 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivi tyLoggerIfIsolatedWorld(); 123 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivi tyLoggerIfIsolatedWorld();
124 if (activityLogger) { 124 if (activityLogger) {
125 Vector<String> argv; 125 Vector<String> argv;
126 argv.append("iframe"); 126 argv.append("iframe");
127 argv.append(fastGetAttribute(srcAttr)); 127 argv.append(fastGetAttribute(srcAttr));
(...skipping 12 matching lines...) Expand all
140 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree()) 140 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree())
141 toHTMLDocument(document()).removeExtraNamedItem(m_name); 141 toHTMLDocument(document()).removeExtraNamedItem(m_name);
142 } 142 }
143 143
144 bool HTMLIFrameElement::isInteractiveContent() const 144 bool HTMLIFrameElement::isInteractiveContent() const
145 { 145 {
146 return true; 146 return true;
147 } 147 }
148 148
149 } 149 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFrameOwnerElement.h ('k') | Source/core/html/HTMLObjectElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698